Write via solr for real this time
Merge /usr/local/home/jasonk/tmp/datastax_rails_tmp

Conflicts:
	lib/datastax_rails/persistence.rb
Fix merger conflict
Remove columns that are set to nil when using Solr storage method