generalizing templates -- specific verbiage still in views.py
Merge remote-tracking branch 'ottonomy/master'