Make sure freeloading connections get dropped (fixes #11)

The code is Shane's--I'm commit it so I can close out the workitem and merge