Update diamond

If diamond dies for any reason it leaves the lockfile /var/local/subsys/diamond and the pidfile /var/run/diamond.pid sitting on the disc. This prevents future attempts to 'service diamond start'. This change checks that diamond is still alive before looking at the lockfile. If it is not alive, the lockfile is zapped and it can then be started.
add 'minutes' to time conversion utility
add simple uptime collector
Merge pull request #655 from sanga/uptime_collector

add simple uptime collector
Merge pull request #656 from bhepple/patch-1

Update diamond
Merge branch 'master' of github.com:python-diamond/Diamond