Merge branch 'release/0.2.2' v0.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Dec 2015 21:22:41 +0000 (16:22 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Dec 2015 21:22:41 +0000 (16:22 -0500)

Trivial merge