Style Fixes
Merge branch 'master' of https://github.com/Jthomas72/outbreak

Conflicts:
	birdseye/src/freegeoip_accesser.py