Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 May 2016 19:43:43 +0000 (15:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 May 2016 19:43:43 +0000 (15:43 -0400)

Trivial merge