...
Merge branch 'master' of https://github.com/Afterburn/status-lcd

Conflicts:
	misc/informative.py
...