updates
Merge branch '2014-bg-ogre' of github.com:saga-project/PilotMapReduce into 2014-bg-ogre