Update to aliases and environment variables
Merge branch 'master' of github.com:vdumoulin/dotfiles

Conflicts:
	bash/env