refactor jade
rename partials
Merge branch 'master' into gh-pages