Need to finish this, just a savepoint
Timeout is now configurable through S2, and not apache
Merge branch 'timeout'