simplify git branch thang, fixes #1