Merge remote-tracking branch 'mdo/master' into scss-convert

Conflicts:
	README.md
	index.html
Merge branch 'scss-convert' into gh-pages (again !)

Conflicts:
	index.html