Remove junk and update .gitignore
Merge branch 'master' of https://github.com/eldridger/dataexchange-diffmerge