Adds basic support for Rails 4
Bumps version [ci skip]
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into mark-selected-facets