Update scripts in light of reading greycat's FAQ
Merge branch 'master' into osx