Use webmachine develop branch.
Merge pull request #155 from basho/csm-develop

Use webmachine develop branch.