Merge upstream

Upstream changed gemspec to allow newer versions of rails which will be needed in the future.