2nd try: .gitignore, fix active branch, & drop superfluous stuff

Same deal as last time, but with one less silly bug:

First and last commits may or may not interest you.

Second commit (09e0cff) fixes a pretty serious bug in active_branch.