Merge branch 'master' into instanttim
Merge pull request #4 from jepefe/master

An import of all instanttim changes and fixes from before this project was on github
Revert "Merge branch 'master' into instanttim"

This reverts commit e33c0e145e72c57db6da47d5a8d7be77986f6228, reversing
changes made to a01550ef345af29c4a112b9f8beaebb6921dbbfb.
Merge branch 'instanttim' of https://github.com/jepefe/monitormate into instanttim
Merge pull request #5 from jepefe/instanttim

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