Merge branch 'master' of github.com:dvdln/node-pushover-client

Conflicts:
	package.json
1.3.7
Merge branch 'master' of github.com:dvdln/node-pushover-client