Merge pull request #82 from snordt/master

data and formatting updates to timeline feed
Edits to timeline and add-fields script