working on ubuntu
Merge pull request #15 from basho/dev-2.x-bryan

working on ubuntu