Sinatra 1.4 was released, lock it to that version
Merge pull request #1124 from padrino/sinatra-1.4

Sinatra 1.4 was released, lock it to that version
Merge remote-tracking branch 'upstream/master' into super-admin

* upstream/master:
  Sinatra 1.4 was released, lock it to that version