show token in status and query includes keywords
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/ace/ext-tern.js
	reference/TODO.md