Massive update. Been working almost exclusively on my laptop recently and hadn't needed to sync
Merge branch 'master' of github.com:emallson/dotfiles

Conflicts:
	.emacs.d/init.el
	.gtkrc-2.0
	.zsh-update
	.zshrc