Clean up and finish twisted AMP integration

* See all #17 commits for details on #34.

Commit closes #17 and fixes #34.