cider jump back.
Merge branch 'master' of https://github.com/mahinshaw/emacsd

* 'master' of https://github.com/mahinshaw/emacsd:
  Added smartparens keymappings
  Cider default changes.
  Update windows to use 24.4 features for screen resizing.
Merge remote-tracking branch 'refs/remotes/origin/master'

* refs/remotes/origin/master:
  Added smartparens keymappings
  Cider default changes.
  Update windows to use 24.4 features for screen resizing.