Cleanup and packaging fixups
Release 0.9.5