Fix packaging

@meastman review and then push to pypi?