UPDATED Dockerfile
Merge branch 'master' of github.com:jonfk/titan-docker