Further setup script improvements
Merge branch 'master' of https://github.com/ink-me/environment