less aggressive cache busting, updated tests
Merge pull request #204 from Petercopter/cache-adjustments

less aggressive cache busting, updated tests