Merge pull request #1 from jepefe/instanttim

An import of all my changes and fixes from before this project was on github.
Remove some data
Revert "Remove some data"

This reverts commit b9b1978ecefc06626a3a67e7bb300335245bc855.
Revert "Merge pull request #1 from jepefe/instanttim"

This reverts commit 22e1708a3e61f34415b824bcb90c199ad9a0f04a, reversing
changes made to ce4303d9921460598bd1a75db022055a7425ff1f.
Merge branch 'instanttim'
Merge pull request #4 from jepefe/master

An import of all instanttim changes and fixes from before this project was on github