Fix some Rubocop violations
Fix typo in Rubocop cleanup step
Revert TEMPLATE_BRANCH to master

Remove template branch used for testing changes.
Merge pull request #11 from thegarage/you-have-30-seconds-to-comply

You have 30 seconds to comply