Manual "Merge" of branch Ryan

The master branch and our developer branches differed way too much to
actually be able to merge, so I just added in the relevant files that we
need to use with Tesseract.