Global linum mode turned on.
Merge branch 'master' of https://github.com/xenodium/env

Conflicts:
	emacs/emacs