(Issue 290) Add ability to disable 'indirect access' in general search using 'includeIndirect' option.
(Issue 290) Removing a stray if statement that snuck in and caused a weird bug. Also some opt-handling clean-up.
(Issue 290) Improving general search test documentation
Merge branch 'master' into issue-290

Conflicts:
	node_modules/oae-search/lib/util.js
	node_modules/oae-search/tests/test-general-search.js
(Issue #290) Better documenting the params option.
Merge branch 'issue-290' of git://github.com/mrvisser/Hilary into issue-290