T36 journalingest

Looks like this may require a manual merge.  I had to manually merge 8d945e1d197cecc726b4fdc48feb82d13399e4c7 (changes to views.py) to enable this branch to work.