Added flickr update script
Merge branch 'master' of github.com:mayhem/mayhem.cat

Conflicts:
	templates/index