a few more changes
adding smartscan mode
Merge branch 'master' of git://github.com/lshort/emacs-init