merge with Brian's windows changes, and simplify help to make it accurate
Make sure we have the master branch before calling git flow init