Update git branching strategy

[jwu910]

Bring master up to date with development
Make master default branch again
Update documentation to reflect new expected workflow

Reasoning, there isn't a need to maintain 2 main branches while using topic branches, can merge directly to master and cut release branches for publication.