update hostname thing
Merge branch 'master' of github.com:stwalkerster/environment