Merge branch 'release/0.3.4' v0.3.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jan 2016 18:33:17 +0000 (13:33 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jan 2016 18:33:17 +0000 (13:33 -0500)

Trivial merge