cleanup
Merge branch 'master' of github.com:mwsobol/SORCER

Conflicts:
	configs/webster-prv.config