refactoring
regularized some tabs
more housecleaning
Merge http://github.com/sourkremlin/distribution