My test branch which combines the different PR's I have recenly done

- it contains a few more fixes to get the demo started and be able to run different demos.
- demos which run for me on Py2 and Py3 have the py3-port tag added.