Add Ruby 2 to travis
Allow activerecord > v3.0 for rails 4
Merge remote-tracking branch 'fny/rails4'