Add Jade language
Added missing dependency
Add Haml language
Fixed typo in swig filter
Add Erlang language
Add Fortran language
Add LOLCODE language
Merge branch 'master' into prism-lolcode

Conflicts:
	components.js
Merge pull request #438 from Golmote/prism-lolcode

Add LOLCODE language
Merge branch 'master' into prism-fortran

Conflicts:
	components.js
Merge pull request #436 from Golmote/prism-fortran

Add Fortran language
Merge branch 'master' into prism-erlang

Conflicts:
	components.js
Merge pull request #435 from Golmote/prism-erlang

Add Erlang 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
Merge branch 'master' into prism-jade

Conflicts:
	components.js
Minor edits
Merge pull request #433 from Golmote/prism-jade

Add Jade language