.gitignore
merge
battery status as platform dependent
Merge branch 'master' of http://github.com/edvorg/emacs_configs into arch_linux