Fixed ls aliases on non-cygwin and removed 2 line command block in vimrc