Handle war sidequests better
Merge branch 'master' of github.com:houeland/kolproxy