cleaned up guardian templates
Merge branch 'master' of https://github.com/honorflight/honorflight-form-prototype