ignore cask stuff
Merge branch 'master' of github.com:expez/.emacs.d
Revert "replace paredit with smartparens"

This reverts commit c17fcac7d1ee6051541cb1b04b7cac70f6656dee.

Conflicts:
	.gitignore
	init-smartparens.el