re #31 - fixed flickr gallery

Also fixed the footer date system ('now')
Merge branch 'gh-pages' into feature/31-flickr-gallery

Conflicts:
	_site/blog/2010/11/team-workshop/index.html
	_site/blog/2010/12/index.html
	_site/blog/2010/12/nooku-jam-stockholm/index.html
	_site/blog/page11/index.html
	_site/blog/rss.xml
	_site/sitemap.xml
Merge branch 'gh-pages' into feature/31-flickr-gallery