Changing timing code to use time.time() instead of time.clock()