removed vim -> vi functionality, because it cannot be optional and work for all cases at the same time
1918575 - Use wrappers for vi/vim instead of aliases