Fix merge issue
Fixing another merge issue
Change riak ping test based on platform. Because file limits.
Update deps
Merge pull request #154 from basho/sgt-20-fixes

Fix merge issues