Change some defaults in the sample config file.
Merge branch 'master' of https://github.com/varena/varena