Revert "update"

This reverts commit 15fcb63bd56bafe24124995ae9914a26aec7effe.
add rake task
Merge branch 'master' of heroku.com:scrap-flickr

Conflicts:
	lib/tasks/scrap.rake
update
update
update
update
udpate
update
update
update