change from tmp repo
Merge branch 'master' of https://github.com/terryockendon/setup-scripts