Increased number of retires to get arduino version to 15 (15 seconds).
On a non-official Arduino bootloader + brewpi init took longer than 10 seconds.
print cause of conflict in BrewPiProcess
added pin list for leonardo with the original DIY shield
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
Move serial setup to brewpiVersion.py
This patch should be merged in conjunction with the Arduino version checking patch to -tools.

This patch moves the setup of the 'ser' and 'conn' variables to a method within brewpiVersion.py so that it can be used by other files as well- specifically for this case, the updater.py so that it can check the version of the hex file on the Arduino.
Correct arg passing to brewpiVersion
Added removeDontRunFile helper method
Added removeDontRunFile helper function to easily remove  from path passed to it. This will make it easy to restart brewpi via python
moved serialSetup to BrewPiUtil
Updated setupSerial method to be imported from BrewPiUtil instead of brewpiVersion
This commit should be used in conjunction with the related commit on brewpi-tools
Added stopAll() method
stopAll() will quit all instances of BrewPi, and then write the do_not_run_brewpi file so that BrewPi
does not auto-restart. This is useful when communicating via serial with the Arduino and you don't want
your communications stepped on by BrewPi restarting on its own
Added enableWlan.sh
enableWlan.sh is a script that pings the IP address set in  every  minutes. If there is no response after
it assumes the wifi on the Pi crapped out (the usual case) and re-enables the interface.

This merge should be applied in conjunction with the similar commit in brewpi-tools
Moved install functionality inside enableWlan.sh
Moved install functionality from the install.sh script to enableWlan.sh . Additionally, removed the need to hard-code
the IP in the file, which would cause merge conflicts for users down the road (great catch Elco)
Moved  out of install code
Modified  code
Added ifdown command
Fixed cron entry
Changed cron entry to use >> instead of > so as to not overwrite existing logs