Actually final tidying this time!
Merge pull request #4 from hflynn/ci_release_servers

Actually final tidying this time!