mac stuff
Merge branch 'master' of github.com:Oscarlsson/dotfiles

Conflicts:
	.gitmodules