added idle-highlight-mode
idle-highlight-mode
Merge branch 'master' of github.com:tsolar/emacs

Conflicts:
	init.el
haml tabs
rainbow mode
Merge branch 'master' of github.com:tsolar/emacs

Conflicts:
	.gitmodules
Merge branch 'master' of github.com:tsolar/emacs

Conflicts:
	.gitmodules
	init.el
	modified:   .gitmodules
	deleted:    python.el