Command line options to toggle auto-loading of images, plugins and execution of scripts
Merge branch 'configurationchanges' into featuremerge

Conflicts:
	surf.1