Merge branch 'release/1.0.0'
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 20:05:33 +0000 (16:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 20:05:33 +0000 (16:05 -0400)

Trivial merge