updates to allow pip packages to install cleanly

@kdodia can you test this out?
Can you try that, and if it works, push the change and we will merge.