Cleanup .gitignore - not sure when I added all that, and why???
Cleanup of joe editor backup files
Merge remote-tracking branch 'upstream/master'