update submodules
Merge branch 'master' of github.com:rnicholson/personal_dotfiles
fixes for mac os
Merge branch 'master' of github.com:rnicholson/personal_dotfiles

Conflicts:
	.gitmodules