change some more occurences of <?= to <?php echo
more sane default configuration
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #376 from fkooman/develop

update default config file, replace <?= with <?php echo