[WIP] Use mocha instead of rspec-mock syntax
Update thor to a more recent version