Autopair
Merge branch 'master' of github.com:daniel-ness/.emacs.d
Merge branch 'master' of github.com:daniel-ness/.emacs.d

Conflicts:
	init.el