bumping version and history
Merge branch 'master' of ssh://github.com/segmentio/nightmare
fixing merge