Merge branch 'release/1.0.0' v1.0.0
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 28 Oct 2016 18:54:16 +0000 (14:54 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 28 Oct 2016 18:54:16 +0000 (14:54 -0400)

Trivial merge