updated default config
Merge branch 'master' of https://github.com/jlthorpe/dev.cloudcampsimpver.org

Conflicts:
	includes/sm_config.inc

trying to merge#
updated