minor cleanups
Merge branch 'master' of https://github.com/zaun/Wiki