Move basho-bench to a subdirectory
Add Riak container