init
Merge branch 'master' of github.com:validkeys/rails-cassandra

Conflicts:
	.gitignore