Licensing, ready for npm publish
Merge branch 'master' into copyright

Conflicts:
	package.json
Update LICENSE
Merge pull request #1 from commuterjoy/copyright

Licensing, ready for npm publish