Merge branch 'release/1.0' v1.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Jun 2014 15:38:06 +0000 (11:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Jun 2014 15:38:06 +0000 (11:38 -0400)

Trivial merge