Merge branch 'master' into vanchi/sentinel2

Conflicts:
	server/server.js
	tests/client.presence.test.js
rename server to http_server
Merge pull request #50 from zendesk/vanchi/simplify_persistence_n_tests

Vanchi/simplify persistence n tests
Merge branch 'master' into vanchi/sentinel2

Conflicts:
	package.json