DOC: tools.rst: GitFlow https://github.com/datasift/gitflow
DOC: autogenerated usage docs
DOC: tools.rst: GitFlow https://github.com/datasift/gitflow
DOC: autogenerated usage docs
DOC: tools.rst: GitFlow https://github.com/datasift/gitflow
DOC: tools.rst: GitFlow https://github.com/datasift/gitflow
DOC: tools.rst: GitFlow https://github.com/datasift/gitflow
DOC: tools.rst: GitFlow https://github.com/datasift/gitflow
Merge branch 'develop' of ssh://github.com/westurner/dotfiles into develop

* 'develop' of ssh://github.com/westurner/dotfiles:
  BUG: usrlog.sh: difference in HISTTIMEFORMAT btwn Linux / OSX #16
  ENH: ~/.hgignore_global: Global hg ignore globs
  BUG: .gitconfig: excludesfile = ~/.gitignore_global
  BUG: ipython_config.py: GVIMBIN, MVIMBIN
  BUG: .xinitrc: xlck.sh -S
DOC: tools.rst: GitFlow https://github.com/datasift/gitflow