print cause of conflict in BrewPiProcess
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.
Convert indents to spaces in BrewPiVersion.py
refactored common code to get the version number from the Arduino into brewpiVersion.py
Fixed bug that continous serial data from the Arduino, would cause a deadlock in 'for line in ser': line 36 in brewpiVersion.py
Merge remote-tracking branch 'mdma/develop' into develop, skip config.cfg.example which had personal settings accidentally merged in