added promises to tor and repos
small fixes before merge
fixed merge conflicts
removed unused comments and functions
removed unused function
Merge pull request #6 from xiamike/zach-promises

Zach promises