bump version
Merge branch 'master' into prep-3.0.0.rc

Conflicts:
	lib/formtastic/version.rb
Merge pull request #1021 from justinfrench/prep-3.0.0.rc

Prep for 3.0.0.rc