Merged pr 16 17

I have merged #16 and #17 together to ensure multiline highlighting works with the new format `#element(...)` 

Haml:
![screen shot 2014-11-22 at 12 16 58](https://cloud.githubusercontent.com/assets/1273965/5154121/7b12484a-7241-11e4-8a3f-cedaf0fb372a.png)

Hamlc: 
![screen shot 2014-11-22 at 12 16 30](https://cloud.githubusercontent.com/assets/1273965/5154122/83ecd0e8-7241-11e4-9316-4e65b67d5aad.png)