version fixed to suite OpsCode server
version fixed to suite OpsCode server
cookbook fixed to work with ubuntu 12.04
ulimit added to json dependencies
Default parameters added for datastax recipe
Pull #83 manually, resolve conflicts, bump version to 2.6.0

Fixes #82.

Conflicts:
	metadata.json
	metadata.rb
Sync with upstream