Fixed overriden settings which clashed with non-play submodules
Merge pull request #2 from mcveat/settings-fix

Fixed overriden settings which clashed with non-play submodules