Switch to git flow, refs #227
Merge pull request #93 from tlvince/refactor/git-flow

Switch to git flow, refs #227