fix env
Merge branch 'master' of github.com:ernix/dotfiles

Conflicts:
	bashrc