Some style fixes
Move i3bgbar.py to i3bar.py
Merge branch 'i3-fixes' into develop