rejig templates, deprecate 'empty' template and rubocop them
Merge pull request #1201 from middleman/templates-rejig

Templates rejig