Merge branch 'release/0.0.4' v0.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 21 Jan 2016 17:29:03 +0000 (12:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 21 Jan 2016 17:29:03 +0000 (12:29 -0500)

Trivial merge