use dolist add-hook for linum-mode
Merge remote branch 'origin/master'

Conflicts:
	.emacs.d/init.elc