Merge pull request #6 from timlinux/master

Refactoring and cleanups to orchestration scripts