Lucy commit
Merge branch 'lucybot'

Conflicts:
	lucy/nyt-custom-api.js