Code clean-up
Merge branch 'master' into issue-284

Conflicts:
	node_modules/oae-search/lib/api.js