Merge branch 'master' of github.com:jkitchin/org-ref

diff --combined jmax-bibtex.el
index f728d582e47ea58993dafa5632ae1596f2945f0b,52c84b1d032845d7bdae96407a86d3da4efe41c0..066c406f4114eb3f3ee5338b418739caa24b4bc9
--- 1/jmax-bibtex.el
--- 2/jmax-bibtex.el
+++ b/jmax-bibtex.el
@@@ -514,7 -514,7 +514,7 @@@ _r_: Refile entry _k_: Add keyword
  _e_: Email entry  _K_: Edit keywords          _L_: clean entry   _P_: Pubmed
  _U_: Update entry _N_: Open notes             _R_: Crossref      _g_: Google Scholar
  _s_: Sort entry   _a_: Remove nonascii        _h_: helm-bibtex   _q_: quit
 -_u_: Update field _f_: file funcs
 +_u_: Update field _F_: file funcs
  "
     ("p" org-ref-open-bibtex-pdf)
     ("P" jmax-bibtex-pubmed)
@@@ -534,8 -534,8 +534,8 @@@
     ("K" (lambda ()
          (interactive)
          (org-ref-set-bibtex-keywords
-          (read-input "Keywords: "
-                      (bibtex-autokey-get-field "keywords"))
+          (read-string "Keywords: "
+                       (bibtex-autokey-get-field "keywords"))
           t)))
     ("b" org-ref-open-in-browser)
     ("r" (lambda () (interactive)
@@@ -551,7 -551,7 +551,7 @@@
     ("e" email-bibtex-entry)
     ("U" (doi-utils-update-bibtex-entry-from-doi (jmax-bibtex-entry-doi)))
     ("u" doi-utils-update-field)
 -   ("f" jmax-bibtex-file/body)
 +   ("F" jmax-bibtex-file/body)
     ("h" helm-bibtex)
     ("a" jmax-replace-nonascii)
     ("s" org-ref-sort-bibtex-entry)