Really work on Debian/Ubuntu

Created by: jshholland

Fix all the stuff I forgot to include the first time round, mainly paths/users in config file templates.