Fix WIP
Merge branch 'dev1' of github.com:Core2uu/raspberry-cereal into dev1

Conflicts:
	config/raspberry_cereal.cfg
	raspberry_cereal/__init__.py