Merge branch 'master' of github.com:avriette/riak-dc

Conflicts:
	package.json
Merge branch 'master' of github.com:avriette/riak-dc