Merge branch 'release/1.0.0' v1.0.0
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 22 Jul 2016 19:42:53 +0000 (15:42 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 22 Jul 2016 19:42:53 +0000 (15:42 -0400)

Trivial merge