Added possibility to use nested context objects
Support TypeScript
added peg.js extensions to regex rules list
Added '<! @endif -->' syntax to allow valid blocks that are hidden by default.
Added tests for '<! @endif -->' syntax.
Add the '@exec' keyword who can execute function with parameter.
Merge branch 'jojanaho-master'

* jojanaho-master:
  Added possibility to use nested context objects
Merge branch 'typescript' of https://github.com/mrydengren/preprocess into mrydengren-typescript

* 'typescript' of https://github.com/mrydengren/preprocess:
  Support TypeScript
Merge branch 'mrydengren-typescript'

* mrydengren-typescript:
  Support TypeScript
Merge branch 'pegjs-extension' of https://github.com/Qix-/preprocess into Qix--pegjs-extension

* 'pegjs-extension' of https://github.com/Qix-/preprocess:
  added peg.js extensions to regex rules list

Conflicts:
	lib/regexrules.js
Merge branch 'Qix--pegjs-extension'

* Qix--pegjs-extension:
  added peg.js extensions to regex rules list
added .jade
Merge branch 'RobinRadic-master'

* RobinRadic-master:
  added .jade
Merge branch 'feature/execute-function' of https://github.com/Spy-Seth/preprocess into Spy-Seth-feature/execute-function

* 'feature/execute-function' of https://github.com/Spy-Seth/preprocess:
  Add the '@exec' keyword who can execute function with parameter.
Merge branch 'Spy-Seth-feature/execute-function'

* Spy-Seth-feature/execute-function:
  Add the '@exec' keyword who can execute function with parameter.
Merge branch 'master' of https://github.com/xax/preprocess into xax-master

* 'master' of https://github.com/xax/preprocess:
  Added tests for '<! @endif -->' syntax.
  Added '<! @endif -->' syntax to allow valid blocks that are hidden by default.
Merge branch 'xax-master'

* xax-master:
  Added tests for '<! @endif -->' syntax.
  Added '<! @endif -->' syntax to allow valid blocks that are hidden by default.
added simple (unwrapped) directives
2.1.0