Merge pull request #121 from tjohns/ci-server

Update scripts for CI server integration