still messing with config
Merge branch 'master' into gh-pages

seriously?