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

Conflicts:
	lib/formtastic/version.rb
add upgrade and compatibility notes to README for country select for #1060
add country_select 2.x syntax to CountryInput docs for #1060
point country_select docs to the right reference gem for #1080
add compatibility and upgrade notes for country_select 2.x for #1060
fix typo
Merge pull request #1061 from justinfrench/note-country-select-compatibility-issues

Note country_select compatibility issues
Merge pull request #1021 from justinfrench/prep-3.0.0.rc

Prep for 3.0.0.rc
clean-up some dependency warnings when generating gem
rely on 2.3-stable branch for CHANGELOG archive
tzinfo had issues on Travis
CHANGELOG for 3.0.0.rc