Merge branch 'release/1.0.0' v1.0.0
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 19:33:16 +0000 (14:33 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 19:33:16 +0000 (14:33 -0500)

Trivial merge