Flatten @should to handle nested arrays
Use the overridden should in insync
Merge remote-tracking branch 'vikraman/fix/rebuild' into pebkac
Merge remote-tracking branch 'vikraman/fix/insync' into pebkac
Merge branch 'makeconf_list' into pebkac

Conflicts:
	templates/makeconf.conf.erb