Commits to help parse out what the &#34 is...
More flag flailing

Leftovers from last night's failed flag attempt. checking it in in hopes that matt can salvage it.
Commits to help parse out what the &#34 is...
More flag flailing

Leftovers from last night's failed flag attempt. checking it in in hopes that matt can salvage it.
Merge branch 'feature/flags' of github.com:CityGenerator/Megacosm-Generator into feature/flags

Conflicts:
	megacosm.py

fixing fugly stuff (I hope)
basic leader data...
basic leader data...
Merge branch 'feature/leader' of github.com:CityGenerator/Megacosm-Generator into feature/leader
basic leader data...
Merge branch 'feature/leader' of github.com:CityGenerator/Megacosm-Generator into feature/leader
analytics changewq
analytics change
new stats
adding deity template changes
Merge branch 'feature/newdeitystats' into develop
added underscore to name variables

no practical effect, I've just been meaning to do it.
oooh, pretty
so leave a message and I'll call you back...
button now working
sample geomorphs is for documentation