Update template.rb
Update template.rb
Update template.rb
Merge remote-tracking branch 'christianramsey/master'
but without: postgres, cucumber, binding_of_caller,
  meta_request

Conflicts:
	template.rb