Make sure extra space is not displayed in PS1 if battery info not available
Merge branch 'personal' of github.com:warby-/dotfiles-sync into personal

Conflicts:
	bashrc