First pass at implementing the tobacco use template
Forgot to prefix the smoking status template partial with an underscore
Merge remote-tracking branch 'ah/develop' into develop
added payer information to cat1 export, fixed patient expired importer