Merge branch 'develop' of github.com:datasift/storyplayer into develop
Merge branch 'develop' of github.com:datasift/storyplayer into develop
Merge remote-tracking branch 'origin/develop' into develop