fix some line parsing issues that could lead to bugs, and fix disconnect
Merge branch 'master' of github.com:mavenlink/mavencraft