Generate the key used for session hashing individually for each server instance
(cherry picked from commit 118a4f7)
Generate the salt used for hashing user passwords individually for each server instance
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'
Encoding has to be specified before any other line of code
Merge pull request #1 from foosel/master

Update