Added homebrew sbin to path
Merge branch 'master' of github.com:rickyah/dotfiles

* 'master' of github.com:rickyah/dotfiles:
  Make --no-ff the default merge strategy
  Show % in battery main menu icon
  Modified osx defaults
Install git-flow with homebrew