Merge pull request #489 from gtch/master

Completed migration to new config system
Merge branch 'master' of https://github.com/HearthStats/HearthStats.net-Uploader