v1 not v2
Merge branch 'master' into gh-pages
Follow style guidelines for CSS
Update configuration and sidebar