Fixing config issues
Merge pull request #50 from DemandCube/dev/kingofpoptart

Fixing config issues