Merge branch 'release/0.0.5' v0.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Nov 2015 19:54:01 +0000 (14:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Nov 2015 19:54:01 +0000 (14:54 -0500)

Trivial merge