Fix for overriding column_family
Merge pull request #13 from backupify/fix_cf

Fix for overriding column_family
Only set the type if it is not provided.
Merge pull request #14 from backupify/allow_type_change

Only set the type if it is not provided.
update gems for cassandra 1.2
cassandra_datum/base would attempt to encode all attributes
as strings using "#{value}" which incorrectly serializes hashes
to '{'key' => 'value'} when is then attempted to be parsed as json
when the attribute is read.

this commit fixes that by converting hashes and arrays using the to_json
method.
updated gem file
Merge pull request #15 from backupify/fix-hash-and-array-initialization

cassandra_datum/base would attempt to encode all attributes
Merge branch 'master' into rails_4

Conflicts:
	Gemfile.lock
	test/base_test.rb