added rainbow-delimiters, fixed elisp-mode, and java/android
Merge branch 'master' of github.com:sebastiw/.emacs.d