Magit configuration
Merged.

Merge branch 'master' of github.com:jesperes/initfiles

Conflicts:
	emacs.el
Added AndersL's CMake mode