base updates to support pip/pypi

THIS IS NOT READY TO MERGE, see #1165