Re-commit
Adding ignores
Merge branch 'master' of github.com:agperson/dotfiles

Conflicts:
	.gitmodules
	home/.vim/bundle/syntastic
	home/.vim/bundle/ultisnips