Merge pull request #232 from chuckdumont/master

Fixes to handling of cache bust query arg