missing files
Merge branch 'develop' of https://github.com/BrewPi/brewpi-script into develop

Conflicts:
	brewpi.py
	settings/config.cfg.example
made socket connection blocking. Fixes error "Socket error(10035): A non-blocking socket..." problem.
Merge remote-tracking branch 'mdma/develop' into develop, skip config.cfg.example which had personal settings accidentally merged in