integrate changes from git issue. closes #568
Merge branch 'master' of github.com:NUKnightLab/TimelineJS