Load app-env if it exists
Merge branch 'master' of https://github.com/jbarnette/dotfiles

Conflicts:
	bash/main.sh