Updates to fix royal-mess up.
Final updates to reflect royal cock-up of previous version.
Now works with pip properly.