Merge branch 'release/1.0.0'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 13:47:33 +0000 (08:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 13:47:33 +0000 (08:47 -0500)

Trivial merge