added tests to controller
Merge branch 'specs'
fixed.. stuff
Merge branch 'master' of https://github.com/bradpsheehan/feed_engine