the plan right now would be to have a dev and staging branch, which would have regression testing. we are still analyzing git models, but really dont want to make it too complicated considering our small dev team and relatively long development cycle