Merge branch 'makeconf_list' into pebkac

Conflicts:
	templates/makeconf.conf.erb