sign with the usual key
a bunch of crap
Merge branch 'master' of github.com:tomjakubowski/dotfiles

Conflicts:
	zshrc