Fix wrap issues and reinstate colourful git commit time