add Ubuntu alongside Debian
Merge remote-tracking branch 'rfugina/master' into testing