Fix serveStatic to look in correct dir for 'default' file (again)

This was originally added in commit 69266a1 but regressed in
commit 4895f111.
Merge pull request #413 from trentm/static-default-again

Fix serveStatic to look in correct dir for 'default' file (again)
Sync /w upstram