Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Mar 2015 13:07:19 +0000 (09:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Mar 2015 13:07:19 +0000 (09:07 -0400)

Trivial merge