Upgrade to sinatra 1.4
Merge pull request #669 from gollum/sinatra1.4

Upgrade to sinatra 1.4