Updated and added default configuration

Some parts of the configuration must be a certain way, so let
those be defaults so that the end user doesn't have to configure
them manually.

Change-Id: I66952eecb1f7ce619c1e2f203a485446712c2d11