Removed -w switch with vim.

Use console vim instead of mvim
You complete me
Cleaned up .vimrc
Merge branch 'master' of github.com:simewn/dotfiles
merge