Add Haml language
Minor edits
Fixed broken ternary
Merge branch 'master' into prism-haml

Conflicts:
	components.js
Merge pull request #434 from Golmote/prism-haml

Add Haml language