Basic changes to eliminate the need for Debian patches

most of the debian patches are just cosmetic (space/comments) so
easier to just merge upstream