All set for next pull request (I hope!)
Merge branch 'master' of https://github.com/bielawb/TabExpansionPlusPlus
Oops, looks like I broke it again. NOW it has to be pull-ready...