Using `variants` for Python def/class constructs.
update function class
markup tests for AspectJ:

intertype method
intertype constructor
trim spaces
hotfix
Update jsdom to v1.x.x
Update mocha to v2.x.x
Merge branch 'update/deps'
Add markup test for nested comments
Add markup test for the infix keyword
Merge branch 'test/haskell'
Merge pull request #616 from ozlerhakan/master

Update the function class
Merge branch 'master' of github.com:isagalaev/highlight.js
Normalied ending new-line in AspectJ markup tests.
Merge remote-tracking branch 'isagalaev/master'