Merge branch 'release/0.0.4' v0.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 24 Sep 2015 17:11:02 +0000 (13:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 24 Sep 2015 17:11:02 +0000 (13:11 -0400)

Trivial merge