updated
Merge branch 'master' of github.com:tristanfisher/tristan-env