Makefile updates

Update Makefile to build RPMs aswell as debs. 
Also pulled some common stuff out to top level vars and restructured Makefile slightly.