Add FIXMEs or other comments marking needed changes or clarifying operation
Add FIXMEs or other comments marking needed changes or clarifying operation

and some more readability cleanups.

jbradberry/django-diplomacy,jbradberry/django-diplomacy,jbradberry/django-diplomacy