Use Jason Woofenden's version from (2013-08-28) as our new base for this branch.

Author:    John Wellesz <john.wellesz@teaser.fr>
Add support for 'trait' and 'finally' coloring and folding
fix exception folding/highlighting to actually work and add an interesting feature where folding will only happen in a certain condition giving control to the user.

**Will not fold:**
try {
} catch () {
} finally {
}

**Will fold:**
try
{
}
catch () {
}
finally {
}
Change maintainer to myself and change notes accordingly