Merge pull request #1 from kdmurray91/dev

Timestream parser
Merge branch 'dev' into upstream

Pull in some misc recent fixes
Merge branch 'docs' into upstream

Brings in the docs branch, via dev