Merge - bit of last minute stuff

I deleted all third party code as it can be downloaded with the script
see my earlier comment about this link in event-demo.shtml