added atelier colorschemes
Add support for AutoHotkey
added hljs prefixes to classes
Merge pull request #262 from atelierbram/atelier-schemes

Conflicts:
	AUTHORS.en.txt
	AUTHORS.ru.txt
Add atyelier themes to test page
Add "mma" as an alias for Mathematica
String substition in ///-regexps in CoffeeScript. Fixes #311.
Using already defined SUBST for CoffeeScript regexps.
Change buildSpan to accomidate no prefix mode
Use buildSpan without prefix in processSubLanguage
Merge branch 'fix/sublanguage-prefix'

Fixes #312
Fix for C++ includes introduced in 1f344a0, fixes #313
Merge remote-tracking branch 'dlimpid/language-autohotkey'

Conflicts:
	AUTHORS.en.txt
Add @dlimpid to authors list in Russian
Update ruby.js

add attr_reader, attr_writer, and attr_accessor to ruby keywords
Make keywords better aligned
Use the more general \b rather than space
Make the infix regular expression smaller
Merge branch 'haskell/clean-up'
Pass in hljs object inside of registerLanguage