Switch to hyphen for css names.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/page/_index