Address review comments: less unused code, merge conflicts, more pep8, TODOs. AUTHORS file.