Make Multiline grammar look right
Add correct end regex for Haml attributes
Improve Hamlc multiple line syntax
Merge remote-tracking branch 'richrace/master'