merged dev-integration into cevans87. Also created a .gitignore for
.orig files, which the diff tool generates quite a bit of.