makes the page not suck so much
Merge branch 'master' into gh-pages