Changes: some refactoring...
Merge branch 'master' of https://github.com/tagyro/sskeychain

# By Andrei Stoleru
# Via Andrei Stoleru
* 'master' of https://github.com/tagyro/sskeychain:
  misc changes