Merge branch 'release/2.0.0' v2.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Feb 2016 13:43:16 +0000 (08:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Feb 2016 13:43:16 +0000 (08:43 -0500)

Trivial merge