More robust log parsing.
Uppercase constants, removed some logging.
Merge branch 'master' of github.com:aspic/g-wiki