Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 May 2015 14:18:07 +0000 (10:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 May 2015 14:18:07 +0000 (10:18 -0400)

Trivial merge