Merge pull request #944 from kwhatmough/next

Improve install scripts