Fix linum space separator
Change TERM variable to match 256 colors
Merge branch 'master' of github.com:shaoner/xconfig

Conflicts:
	resources/emacs/.emacs.config.el.shared