Add cache-busting timestamp to JS/CSS includes
Merge branch 'master' into use-markdown