Fortnight slides complete I believe
Merge branch 'master' of http://github.com/FOSSRIT/SFpresent

Conflicts:
	flock-slides.rst
	output/css/hovercraft.css
	output/index.html
	output/js/impress.js