Added language support for Twig templating
Support for PowerShell syntax.
Merge branch 'master' of github.com:lukeholder/highlight.js into twig
Removing leading white space from Twig snippet
Adding detection test for Twig.
Adding Luke Holder to AUTHORS and CHANGES.
added !makensis command
Merge pull request #600 from idleberg/master

Added !makensis command fot NSIS language
Merge branch 'master' of github.com:drmohundro/highlight.js into powershell

Conflicts:
	AUTHORS.en.txt
	CHANGES.md
Adding David Mohundro and Nicholas Blumhardt to AUTHORS.ru.txt
Moving Powershell class reference and snippet closer to DOS.
Adding main class name for Puppet in class reference.
Noting Nicholas Blumhardt's work in CHANGES.md.
fixed conflict
fixed again conflict
fixed name conflict