bump
Merge branch 'master' of github.com:ldenman/castle

Conflicts:
	home/.xmonad/xmonad.hs
update aliases and xmonad
Merge branch 'master' of github.com:ldenman/castle

Conflicts:
	home/.zshrc