local things
Merge branch 'master' of https://github.com/jaysw/dotfiles

Conflicts:
	.gitmodules
Merge branch 'master' of https://github.com/jaysw/dotfiles

Conflicts:
	gitignore
	zshrc