Merge branch 'release/0.3.3' v0.3.3
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Dec 2015 19:46:46 +0000 (14:46 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Dec 2015 19:46:46 +0000 (14:46 -0500)

Trivial merge