Merge branch 'release/0.1.2' v0.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Jun 2016 18:21:35 +0000 (14:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Jun 2016 18:21:35 +0000 (14:21 -0400)

Trivial merge