Added some org-mode clocking options.
Went back to smartparens.  Also removed reference to helm-smex-if-exists
Fix merge