time parsing
Merge branch 'development' of github.com:wyne/log into development