Branching Structure For This Project

Draft Brainstorming

• master -> our active development branch
• github_master -> tracks upstream master of AM

This is roughly based on the ideas expressed in braintree's branching post. The main difference is that we are pulling from upstream, and the blog post is pushing to upstream.

We use tags on the repo to indicate the current released code, and chargify and conduit reference this tag when pulling in this gem.