Merged in dhom's style fixes and python bundling

Thanks again!