misc updates
Merge branch 'gh-pages' of github.com:unthinkingly/cnp into gh-pages