Add my custom haml package back
Merge branch 'master' into work