Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 17:21:51 +0000 (13:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 17:21:51 +0000 (13:21 -0400)

Trivial merge