NOJIRA Argh. Fix stupid dont-code-at-2am mistakes.
Merge branch 'develop' of github.com:collectiveaccess/providence into develop