Updated CHANGES
Add warning about deprecated stuff for 3.0

Conflicts:
	lib/citrus.rb
Releasing 2.5.0
Move core extensions to lib/core_ext.rb
Require citrus in core_ext.rb
Only require citrus/core_ext in test helpers
Updated CHANGES
Version 3.0.0