Fixed some errors and logging messages

Added basic logging to shoal_agent
Merge branch 'master' of github.com:hep-gc/shoal

Conflicts:
	shoal.conf
	shoal/config.py
	shoal/geoip.py
	shoal/shoal.py