Merge branch 'develop' (v0.12.1)

Author: syl20bnr

spacemacs/packages.el

@@ -1612,7 +1612,6 @@ determine the state to enable when escaping from the insert state.")
       (require 'org-install)
       (define-key global-map "\C-cl" 'org-store-link)
       (define-key global-map "\C-ca" 'org-agenda)
-      (setq org-agenda-files '("~/Dropbox/org"))
       (use-package org-bullets
         :config
         (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))