cleanup: start unifing things, dpkg_arch

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>