Drop old and no longer working /etc/module_options support
Merge branch 'master' into cleanup-cruft

Conflicts:
	gen_initramfs.sh
Drop backticks from initramfs code
Kill trailing whitespaces!!!!!