Merge branch 'release/0.1.1' v0.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Dec 2015 21:26:32 +0000 (16:26 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Dec 2015 21:26:32 +0000 (16:26 -0500)

Trivial merge