catchup
Merge branch 'master' of https://github.com/jeremyjh/dotfiles

Conflicts:
	home/.vim/bundle/snipmate-snippets
	home/.vim/bundle/vim-snipmate