Merge pull request #8 from jondkinney/allow_underscores_in_branch_names

Allow underscores in branch names, better tab completion
Merge remote-tracking branch 'upstream/master'
Allow underscores here too