Merge branch 'refs/heads/master' into experimental

Conflicts:
	assets/scss/vendor/inuit.css
Merge branch 'refs/heads/experimental'
allow linking from top-level main-nav item
load unix timestamp as version for js
colophon update
Merge branch 'refs/heads/experimental'
fitvids on document object