fix #85, require newest rails
Merge branch 'fix/spec_failures_on_traivs'

Conflicts:
	CHANGELOG.md