merging in scorpiobot
Merge branch 'master' of github.com:ratbeard/bingbot

Conflicts:
	package.json