pulling in changes from latest engine commit (splitting conf and vars)
Merge pull request #8 from harlo/master

pulling in changes from latest engine commit (splitting conf and vars)