company better without autocomplete, start using without line numbers
add more helper functions
move server init into core
add diff-hl
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	config/init-eyecandy.el
Merge remote-tracking branch 'origin/master'