Revert "Merge pull request #66 from fanhattan/connection-handling-improvements"

This reverts commit 50496110efbb27225b49e0a584034142df8bd405, reversing
changes made to a95bb65575db65c70e740b7ce94c6cbe6bc41d90.
Merge pull request #70 from ryanlecompte/revert_pull_request_66

Revert "Merge pull request #66 from fanhattan/connection-handling-improv...
Merge pull request #19 from ryanlecompte/master

upstream master