updates to status bar
Merge branch 'master' of github.com:mil/home

Conflicts:
	.xinitrc