Changing 'C' indent to 8 spaces.
Merge branch 'master' of https://github.com/jason-woytowich/emacs-config

Conflicts:
	personal/custom.el