fix boxen setup
Merge branch 'master' of github.com:riethmayer/dotfiles

Conflicts:
	bash/aliases
	bash/env
	bash/git
	bashrc