Update for docker and remove iMac battery check.
Merge branch 'master' of github.com:davealbert/dotfiles

Conflicts:
	mac_bash_profile
Mege mac_bash_profile (sync && home)