Refactored feeds.js and pulled out all the functions and put them into their own module. Also added Tests for those callbacks.
Merge branch 'dev' of https://github.com/votinginfoproject/Metis into dev

Conflicts:
	services/feeds.js
fixed problem with merge conflict