Cleaning up after major dev branch merge.

Includes persons module and bootstrap 3 migration changes.