Merge pull request #98 from thomasalrin/0.5

riak start
cc
Merge pull request #99 from rajthilakmca/0.5

cc
upstart script changes