Cleans up bashrc
Cleans up vim settings
Merge branch 'master' of github.com:austinpray/dotfiles