Updated updates/ file paths
Merge branch 'develop' of github.com:BrewPi/brewpi-tools into develop. Discard changes on remote

Conflicts:
	updater.py
Check the brewpi-tools repo for updates before running updater or installer
Print instructions when git pull fails in update-this-repo.sh