mixins, add back some contact info
Merge branch 'master' into gh-pages