Revert "Convert to slim part 2"

This reverts commit e042abbfb623eccdae444b8fd375f33c636aa880.

Conflicts:
	faq.html.haml
Revert "Converting to slim part 1"

This reverts commit fc687465e870de566cd465decd3b388066df3109.
Fixing up faq back to haml, adding ignores

The sort now uses the number in the filename, the order attribute if
the filename does not contain a number, or empty string if everything
before fails.
Merge https://github.com/cdi-spec/cdi-spec.org

Conflicts:
	_ext/faq.rb