merge nico's package/rules.mk and package/templates.mk into one file, update packages...