Setting up additional default configuration.
Two more settings.
Merge pull request #438 from SalesforceFoundation/feature/433-additional-default-settings

Feature/433 additional default settings
Merge dev into feature/436-include-layouts