Refactoring

Too much to mention; sorry.  Functionality is pretty similar, but done hopefully in a slightly more clear way.  Also separated out the pbuilder stuff from the debuild stuff.