Merge pull request #309 from kylejohnson/master

Add wget to Dockerfile prereq
Merge pull request #310 from kylejohnson/master

Enable universe in the Docker container [ci skip]
Added a hack for upstart