deleted whitespace
fixed merge conflicts
address merge conflicts, twitter auth issue pending
Merge branch 'master' of github.com:bradpsheehan/feed_engine