Thanks for the suggestion. I haven't heard of herogit before. I'd like to add more flexibility with branches in the future, but wanted to release it always using master in the meantime.
I'm tempted to give Katana a shot with my next app. Who knows, I might like it more.