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'