refactor
Merge branch 'master' into twitter
changed routes
before actions for twitter and tumblr search
Merge branch 'twitter' of github.com:suewhite/See-More into twitter