Reset ping timer on publish, subscribe, unsubsribe. Adding tests and fixing test on pingreq resetting timer
Merged upstream
Merge pull request #46 from clementineinc/master

Conflicts:
	lib/client.js