Add require 'erb'
Remove ActiveSupport dependency from timeline code
Update to latest Cassandra gem
Change cassandra gem link
Merge pull request #13 from karlfreeman/patch-1

Change cassandra gem link
SimpleUUID to string conversion

convert UUID to string to avoid an error with simple_uuid 0.2 which
does not convert the uuid automatically
updated simple_uuid to version 0.2

0.2 is required by cassandra
Merge pull request #17 from sideshowcoder/master

Fix the SimpleUUID to string conversion for SimpleUUID 0.2
Merge branch 'master' of https://github.com/carbonfive/active_column

Conflicts:
	Gemfile.lock
	active_column.gemspec