rainbow blocks
gitignore
Merge branch 'emacs24.4' of github.com:px0/dotfiles into emacs24.4

Conflicts:
	emacs.d/.emacs.desktop
	emacs.d/cider-history
	emacs.d/user.el
finally got the brighet parens working