made hostname work on linux & mac
Merge branch 'master' of github.com:andystanton/bashstrap