Progress on all optimization elements
Merge branch 'master' of github.com:pjbull/civil_conflict