Merge current head of collectiveaccess/providence.

This is an initial merge between the upstream collectiveaccess
fork and the local version from the internal gitolite repository.