Argh, audio preloading is a pain
Merge branch 'master' into gh-pages