Merge pull request #8 from isitgeorge/master

Update to master
Merge pull request #9 from isitgeorge/master

Update config variables
Fix config reload
Merge pull request #11 from FearFree/master

Fix config reload