Completion inside string + sample with node.js#require
Merge branch 'master' of https://github.com/angelozerr/tern

Conflicts:
	lib/tern.js