wingo: update status
wingo-status: disable wireless and update batter
Merge branch 'master' of https://github.com/NPerry/dotfiles

Conflicts:
	bin/wingo-status