Tweaks to the functional tests
Merge branch 'develop' of github.com:datasift/storyplayer into develop