Fix mark-multiple/paredit keybindings conflict.
Remove paredit from Scala mode.
Add current-as-root function.
Merge branch 'master' of github.com:aroemers/.emacs.d

Conflicts:
	init.el