Merge branch 'master' into linux_handling

diff --cc obok_src/config.py
Simple merge

diff --cc obok_src/obok/obok.py
index 2fdf9bf6bffc422afd1ab17a8080ef73c90e38f1,b2fb2537a2430e56174e9e029c12731c531fa3f4..21ef14aef37cfff1a634b8524781da7487029f14
--- 1/obok_src/obok/obok.py
--- 2/obok_src/obok/obok.py
+++ b/obok_src/obok/obok.py
@@@ -290,8 -291,8 +291,8 @@@ class KoboLibrary(object)
      written by the Kobo Desktop Edition application, including the list
      of books, their titles, and the user's encryption key(s)."""
  
 -    def __init__ (self, serials = [], device_path = None):
 +    def __init__ (self, serials = [], device_path = None, desktopkobodir = u""):
-         print __about__
+         print(__about__)
          self.kobodir = u""
          kobodb = u""