Merge branch 'master' of https://github.com/mrjoes/sockjs-tornado into conflicting_localhost
Merge branch 'conflicting_localhost' of https://github.com/maparent/sockjs-tornado