Merge branch 'feature/steveRefractor' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 4 Sep 2018 12:29:04 +0000 (08:29 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 4 Sep 2018 12:29:04 +0000 (08:29 -0400)

Trivial merge