gitconfig changes
update vimrc
Update vim scripts
sorry
Update snippets
Merge branch 'master' of github.com:jb55/dotfiles

Conflicts:
	.gitmodules
	.vim/bundle/nerdtree