Merge branch 'release/1.0.0' v1.0.0
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 17:59:58 +0000 (13:59 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 17:59:58 +0000 (13:59 -0400)

Trivial merge