removing r/w timeout as it is not serving presumed purpose
added cache control header
Merge branch 'master' into rateLimit