Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jan 2015 14:41:47 +0000 (09:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jan 2015 14:41:47 +0000 (09:41 -0500)

Trivial merge