Suggested workflow

Since we have a small group, we follow a workflow suggested by Marc here. https://github.com/marcpaterno/devel-notes/blob/master/git-workflow.md

Currently we don't use the fork/pr work model.