Warning cleanup.
Fix gtk3 build at risk of breaking windows build
change header include order to fix win64 build
Update to experimental r13565
Start cleanup for merge into trunk
Experimental merge of Ponyscape features into trunk (will not compile)