fix broken tests, minor cleanup
fix annotations CSV in/output, refs #920, #923

ensure all columns are written correctly, add test
fix time format reading
Merge branch 'master' into integration