Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 19 May 2015 20:22:25 +0000 (16:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 19 May 2015 20:22:25 +0000 (16:22 -0400)

Trivial merge