yml if condition
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
gem lock
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock
local storage riak init
Merge pull request #90 from thomasalrin/0.5

0.5 local storage init