Moved ~/.vim/vimrc to ~/.vim/.vimrc - Vim 7.4 now supports .vimrc to be located in ~/.vim