various changes
Merge branch 'master' of github.com:jb55/dotfiles

Conflicts:
	.xmonad/xmonad.hs
	.zshrc