Added compatibility with Rails4
Merge branch 'pr/13'

Conflicts:
	cfoundry.gemspec