Remove conque term. Use rainbarf for battery indicator.
Add missing .vim stuff.