Improved compat with Debian/Ubuntu based distros, template will not generate unneeded blank lines
Hopefully fixed rspec tests