Merge tag 'v2.0.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 20:29:18 +0000 (15:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 20:29:18 +0000 (15:29 -0500)
Version 2.0.0


Trivial merge