Feature/import template fixes

Per [story 60193668](https://www.pivotaltracker.com/story/show/60193668).  Cosmetic fixes to templates and include of Notes column.  (Merge conflict on rebase leading to duplicate commit.)