Upgrade to sinatra 1.4

#656 

Tests and travis passing. Anything I'm missing ?