Tilt 2 compat

WIP, do not merge yet.

This makes Sinatra comptabile with Tilt 2.0 (currently only from master. beta1 is old already) and 1.x.

I had to use Slim from master, but that should not be neccesary once a new version of Slim is released. 

/cc @rkh