Merge pull request #20 from bspaans/master

BS: Simplified hostname-fix script
BS: Waiting for Jenkins to become ready timed out too quickly