Simplify deb rules and naming
Simplify deb rules and naming

neiljerram/felix,matthewdupre/felix,neiljerram/felix,neiljerram/felix,Metaswitch/calico,matthewdupre/felix,neiljerram/felix,Metaswitch/calico