Merge branch 'release/2.0.0' v2.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 20:29:09 +0000 (15:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 20:29:09 +0000 (15:29 -0500)

Trivial merge