Switch back to gem for shoulda-matchers since its compatible with rails4.
Fix bugs with put/patch routes.
Merge branch 'refs/heads/github.master' into github.permissions