scrap email, website
Merge branch 'master' of heroku.com:scrap-flickr
update verify email
update
update
update
remove scrap website
update