Merge branch 'release/1.0.0' master v1.0.0
authorIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 16:15:50 +0000 (12:15 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 16:15:50 +0000 (12:15 -0400)

Trivial merge