Merge pull request #90 from snordt/master

Added Office column to splash page, timeline edits
final updates to timeline page per Dave's suggestions