Some tidying + testing in Time plugin.
Merge pull request #181 from greboid/tidying

Some tidying + testing in Time plugin.