Revert "Feature/riak2.0"
Merge pull request #7 from kmjungersen/revert-5-feature/riak2.0

Revert "Feature/riak2.0" until further testing