Merge pull request #1 from kmjungersen/dev

Merging of Dev into master for initial release!  🎉
Merge pull request #2 from kmjungersen/dev

Dev
Merge pull request #3 from kmjungersen/dev

Dev
Merge pull request #4 from kmjungersen/dev

Dev
Merge pull request #5 from kmjungersen/feature/riak2.0

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

Revert "Feature/riak2.0" until further testing
Finished feature riak2.0.
Merge branch 'master' of https://github.com/kmjungersen/DB-Benchmarking
Merge branch 'master' into dev

Conflicts:
	main.py
	riak2db/local.py
	riak2db/main.py