Oops, should probably commit minified css since there's no post-deploy hooks yet
Merge branch 'refs/heads/master' into gh-pages