majormodes.el
Update with desktop config
Moar desktop configs
Merge branch 'master' of https://github.com/timstclair/tconf

Conflicts:
	emacs/major-modes.el