cleaned up code, webmock stubbing requests, timecop working for tests