config update
merged

Merge branch 'master' of github.com:sometxdude/psychic-batman

Conflicts:
	config/global.dcf