fixing detection of multiple feeds of the same type
fixing deprecation warning:
*** Mocha deprecation warning: Change `require 'mocha'` to `require 'mocha/setup'`.
stubbing Time.now to fix Chronic.parse issue since we now aren't in 2012 anymore
Merge branch 'fix-mocha-require'