Removed cache
Merge branch 'master' of https://github.com/citizensense/csk
Added time adjustment and fixed human time output