Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Dec 2015 15:16:24 +0000 (10:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Dec 2015 15:16:24 +0000 (10:16 -0500)

Trivial merge