getopts: Fix combined parameters, and multiple --'s.
Merge branch 'getopts' into merge

Conflicts:
	installer/functions