Revert "Temporarily use private HAML fork with patches"

This reverts commit 824d5082380743aedb6417ed635f30d469c388fa.

Conflicts:

	Gemfile
Add missing mem suite
Merge remote-tracking branch 'upstream/master' into super-admin
Make the output of stylesheet_link_tag etc. html_safe
Tests for safe assettags.
Merge remote-tracking branch 'upstream/master' into super-admin