vim puppet bundle
ignore vagrant dirs
fix ignores, other things
Merge branch 'master' of github.com:epall/dotfiles

Conflicts:
	.gitmodules
	.vimrc