Revert "Merge pull request #19 from asgeirom/master"

This reverts commit 27ccb0947385d2384ad41e5ba47e35ae64df40d2, reversing
changes made to b7eccedf8a25248dd8cd1c04e940c4a7b7712dfe.
Merge pull request #20 from benklett/time

Revert "Merge pull request #19 from asgeirom/master"