rename load files, update some modes
Merge branch 'master' of github.com:blaedj/emacs.d

Conflicts:
	init.d/major_modes_code.el