Initial support for rails 4
Bump version
Merge remote-tracking branch 'upstream/master'

Initial support for rails 4