Diff formatting fixes
Some diff changes
Merge branch 'master' of git.textalk.com:minigitweb