Penultimate prep
Merge branch 'master' of https://github.com/bazookan/mywiki