some things
Merge branch 'master' of github.com:ninjabiscuit/dotfiles

Conflicts:
	.gitmodules