Merge branch 'hotfix/0.8.6'
Against master.
Merge pull request #548 from twitter/klin_jobconf_tool_v2

Against master.
Bumping version numbers
Merge hotfix/0.8.7.
Merge branch 'develop' of https://github.com/twitter/scalding into develop