Fix broken template and write generated dockerfile out to disk. Don't check Dockerfile into git and remove our .deb package we accidentally checked in
Merge remote-tracking branch 'origin/master'