more slideshow integration
Merge branch 'master' of https://github.com/tBaxter/capo
Typographic improvements
Merge branch 'master' of https://github.com/tBaxter/capo

Conflicts:
	tango_capo/static/css/themes/dark.css