Final step in fixing the mess — copying the most up to date python scripts back into the dev branch.