external id and settings update
Merge branch 'master' into paul

Conflicts:
	search.json
Merge pull request #40 from ScriptRock/paul

external id and settings update