Preparing release of 1.1.1
Fix missing branch field in DEFAULT dict

Should fix an error raised on line 951 (SHORT_VERSION_PY % DEFAULT) during Octoprint setup when there's no version info. More info here: https://groups.google.com/forum/#!topic/deltabot/8udyUsJ1c9M
Fixed a couple of more missing branch fields and added Changelog entry
Merge branch 'Wallacoloo-master'
Added removal of pyc files (and their parent folders if they are empty after that) to the python setup.py clean command
Merge branch 'master' into devel

Conflicts:
	CHANGELOG.md