Bug fixing, cleaning up.
Merge branch 'newTilesFeatures' into security
Merge pull request #3 from cleandart/security

Config changes