Allow overriding of xauth template
Allow disabling of firewall
whitespace
Merge pull request #1 from jisaacks/master

Allow firewall to be optional. Allow externally-provided xauth config.