Merge branch 'release/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 20:07:25 +0000 (16:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 20:07:25 +0000 (16:07 -0400)

Trivial merge