Adds boxen support
Merge branch 'master' of https://github.com/href/dotfiles

Conflicts:
	.zshrc
Changes virtualenvwrapper dirs