Cleaning GujaratWorld
pulling
Merge branch 'CleanAndRefact' of https://github.com/xrubio/pandora into CleanAndRefact

Conflicts:
	pandora/examples/gujarat/GujaratWorld.cxx
small merge