edits
Merge branch 'master' of github.com:hazybluedot/mmbar

Conflicts:
	applesmc.py
	status.py
	wifi.py