Support Mac OS X for powerline initialization
Merge branch 'master' of https://github.com/ghing/dotfiles

Conflicts:
	shell/powerline.sh