added some new tests, including binary with acks
updated parser dependency
Merge branch 'upstream' into add/simple-tests

Conflicts:
	package.json
Merge branch 'upstream' into add/simple-tests

Conflicts:
	package.json
bumped parser dependency
Merge branch 'upstream' into add/simple-tests

Conflicts:
	package.json
Merge branch 'upstream' into add/simple-tests

Conflicts:
	package.json
Merge pull request #1443 from kevin-roark/add/simple-tests

added some new tests, including binary with acks
package: bump client
Merge branch 'master' of github.com:LearnBoost/socket.io
Mistake in callback call 'done' instead of 'next' in docs
Merge pull request #1462 from nicolagreco/patch-1

Mistake in callback call 'done' instead of 'next' in docs