Fixed event drawing bug

Use d3.event in timelineMousedownFn and timelineMouseoverFn
Merge branch 'master' into jf-firefoxDrawEvents
Merge pull request #163 from StanfordHCI/jf-firefoxDrawEvents

Fixed event drawing bug
Fixed collab redraw error, needed to initialize a var
Fixed merge conflicts
Merge pull request #164 from StanfordHCI/at-collabFix

Fixed collab redraw error
Merge branch 'master' into dr-panelux