Add a c++ mode.
Merge branch 'master' of github.com:xrash/emacs

Conflicts:
	init.el