Fix a dependency conflict with ActiveRecord 4.0.0 under Bundler

Fix #485