Some work stuff
Merge branch 'master' of github.com:jvanbaarsen/dotfiles

Conflicts:
	zsh/aliases