WIP
More WIP
All working except RR's mock() method
Fix thor dev:test by not auto-requiring
Merge pull request #2 from Invoca/get_tests_passing

Get tests passing