updated and what not
Merge branch 'master' of github.com:kyleterry/new-dotfiles

Conflicts:
	.gitmodules