a couple of fixes
Configuration is now an explicit JSON
Merge pull request #1 from dottorblaster/master

Bunch of fixes