Merge branch 'release/1.0.0' v1.0.0
authorIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 14:47:39 +0000 (10:47 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 14:47:39 +0000 (10:47 -0400)

Trivial merge