fix current branch get
Merge branch 'macosx' of https://github.com/lrascao/dotfiles into macosx