issue #440 - correct nodejs documentation
Merge pull request #441 from commenthol/fix-nodejs-documentation

issue #440 - correct nodejs documentation
Add a spider (Riddler) that spams me.
Merge pull request #442 from cxmcc/bots

Add spider riddler
Merge remote-tracking branch 'tobie/master'

Conflicts:
	README.markdown
	regexes.yaml
	test_resources/test_device.yaml
bump version