minor changes in umurmur
Merge remote-tracking branch 'upstream/master'
Revert "Bugfix: SSL enable/disable now properly stored in config"

This reverts commit 83ba9cfd8bc349989c34ffd3c7ccfc2390adf7e3.
Revert "minor changes in umurmur"

This reverts commit 907f635b2a161ca2f1b954eefb21686a5e458fb9.
removing umurmur from master again
now adding umurmur again, loosing all history..
Merge branch 'master' into mumble