Merge pull request #106 from jbeda/third-party-move

Move third_party code under third_party/src so it can be used in $GOPATH
Fix error recovery.
Merge pull request #107 from lavalamp/master

Fix error recovery.