Merge pull request #11 from dinshaw/master

Upgrade to Rails 4
Merge remote-tracking branch 'phran/master'
Complete rails4 upgrade