Applying more changes suggested by Justin
Keeping only latest 2.5.0 version of Mantid