just some updates
stuff
Merge branch 'master' of github.com:ldenman/castle

Conflicts:
	home/.emacs.d/init.el
	home/.zshrc