Merge branch 'master' into vanchi/sentinel2

Conflicts:
	server/server.js
	tests/client.presence.test.js
rename server to http_server
try travis for sentinel
better script
move around test config files
run tests against both redis and sentinel
Merge branch 'master' into vanchi/sentinel2

Conflicts:
	package.json
remove debug message
stop_sentinel script, force copy configs
Merge pull request #51 from zendesk/vanchi/sentinel2

Sentinel support