Merge pull request #149 from mnederlof/modprobe-template-fix

Fixing layout of modprobe.conf file with more than one option