remove tuzki and such
add tuzki back
Merge branch 'master' into gh-pages