Got rid of all the things causing warnings. Mostly unused imports.
Fixed the map (Hopefully for the last time)
Fixed a bug where countries were not removed from countrydata when
claimed over
Merge remote-tracking branch 'origin/master'