initial support for tumblr auth
Merge branch 'master' of https://github.com/jonathang/memo-hack

Conflicts:
	Gemfile.lock
	config/database.yml