Removing par edit mode from loading.
Funny function, no clue why its been modified
Merge branch 'master' of github.com:reubencornel/emacs-config
Committing slime updates

Conflicts:
	color-themes/solarized/solarized-definitions.el
	my-emacs-config/mode-specific-config.el