Enabled smartparens globally, see if it works
Added smartparens keybindings (defaults)
Just regenerated emacs.el
Merge branch 'master' of https://github.com/pragtich/dot-emacs

Conflicts:
	emacs.el
	emacs.org