Server fixes
Merge branch 'master' of github.com:dtuite/dotfiles

Conflicts:
	.vim/.netrwhist
	.zshrc