Just getting up to date before coding
Merge branch 'master' of github.com:austinbaylis/jEdit