Mods to try and introduce time.
Merge branch 'master' of github.com:JeremyNevill/shortee
Now with time.