Merge branch 'release/1.0.0' v1.0.0
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 15 Sep 2016 17:51:23 +0000 (13:51 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 15 Sep 2016 17:51:23 +0000 (13:51 -0400)

Trivial merge