Merge pull request #29 from daniellemayne/develop

grizzly additions (develop)
Merge pull request #31 from daniellemayne/develop

revert Grizzly enum addition and key on QUANTUM network type instead (develop)
Merge remote-tracking branch 'upstream/develop' into develop