Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 16:43:49 +0000 (11:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 16:43:49 +0000 (11:43 -0500)

Trivial merge