Add option to pass jade instance
Fix broken tests for last commit
Merge branch 'master' into outerjade