merged
Merge branch 'master' of https://github.com/ccann/badger-theme
fixed merge
added support for smart-mode-line, autocomplete, isearch; made some minor tweaks