Format .vimrc
Add 'vi' and 'vim' alias to .bashrc
Move color settings to .vimrc