Improved code standards in main wik binary
Merge branch 'master' of http://stephenwattam.com/git/cgit.cgi/Wik