store changes before merge.
Merge branch 'master' of https://github.com/jason-baker/vim-config
Add changes to from vimrc and the start of the setup.sh