Start of tidy up and transition to Python3
James Harle authored
163d475a