Support for Flickr
Merge branch 'flickr' of https://github.com/manavo/syte into manavo.com

Conflicts:
	syte/templates/base.html