adding latest rounds of tuning
Merge branch 'master' of github.com:elena/.emacs
adding minimap
fiddling