changing controller template
Merge pull request #82 from scupen/fix_controller_scaffolding

changing controller template

Conflicts:
	lib/generators/rails/templates/controller.rb
Simplify generator code now that we only support Rails 4.2