Add Kaleidoscope as a merge/diff tool.
Remove old crap.
Update git e-mail.
Squashed 'emacs.d/pymacs/' content from commit d99823f

git-subtree-dir: emacs.d/pymacs
git-subtree-split: d99823fd75372620f9c8d0ce6bcd73add10ef0d9
Merge commit '15bb8ad171db2ac05aa902341952df4856339250' as 'emacs.d/pymacs'
Add pymacs/ropemacs.
Squashed 'emacs.d/autocomplete/' content from commit 8a13f40

git-subtree-dir: emacs.d/autocomplete
git-subtree-split: 8a13f4030af414d1d59ff174e86a37cbdc2f08e8
Merge commit '388835c757d67104a3bbe2489366638578c328f1' as 'emacs.d/autocomplete'
Add auto-complete.