Diminish smooth-scroll-mode
Remove duplicated paredit key bindings

Thanks for spotting this, @osener
Use idomenu
Drop highlight-cl
Diminish page-break-lines-mode
Enable redshank refactoring support in lispy modes
Explicitly use GNU ELPA under Emacs 23
Enable magit-wip if git-wip command is installed
Ignore errors when popping window config after magit-status
Simplify logic for enabling magit-wip
Remove non-functional magit-status wrapper function
Tidy up init-git.el
Bind org-up-element to the keys for backward-up-sexp in org-mode
Diminish magit-wip-save-mode
Merge remote-tracking branch 'refs/remotes/purcell/master'

Conflicts:
	init-git.el
	init-lisp.el
	init-org.el
Increase smooth scroll step