Some cleanup
Updated Code::Blocks file
Merge remote-tracking branch 'origin/pr/1' into new-weather

Conflicts:
	src/weather_gen.cpp