including view conventions section
Merge branch 'gh-pages' of github.com:ampersandjs/ampersandjs.com into gh-pages
re-build after merge