Merge me

I removed the commit that was causing all the issues. I hope that works now. 
Within this commit there was some things that Igor did that we need so I kept these. 
There was also removal of old examples, X0 and datura-aloneGBL, which I removed.