Changed time.time to just plain time, since we're importing time from time.
Merge pull request #9 from bridgetkromhout/master

Changed time.time to just plain time, since we're importing time from time