Keyringer 0.3.6
Merge branch 'release/0.3.6' into develop
Makefile: set correct modes for editor configurations