Bump mercenary version
Merge pull request #21 from octopress/bump-mercenary

Bump mercenary version