nyan-mode auto load, disabled highlight-symbol
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	dancar-plugins.el