Fixes to make haml work properly with layouts and includes