Added Timer class to record Monte Carlo kernel performance
Fixed merge conflict in Geometry.i