tests for feeds controller
updates the factory for testing
testing for subscriptions controller
work in progress before merge with master
local merge
Merge branch 'master' into testing

Conflicts:
	app/controllers/feeds_controller.rb
adds testing for feed model
adds testing for feeds_controller
adds testing for facebook fetcher and refactoring of get_scores module
adds testing for reddit fetcher
updates tests for reddit_fetcher
merged with master
small fixes to the merge of master with testing branch
local merge to update testing branch with master

Merge branch 'master' into testing
refactoring of the get_scores methods
Merge pull request #64 from chorus-frogs-2014/refactor_get_scores

Refactor get scores