Fixing messed up merge with upstream master, repairing broken Tumblr auth from messed up merge
Removing omniauth.rb