Fixed rainbow mode and some js2 stuff
Merge branch 'master' of https://github.com/oppenlander/dotfiles

Conflicts:
	emacs.d/emacs-init.el
	emacs.d/emacs-init.org