Merge branch 'release/1.0.0' v1.0.0
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 14 Jul 2015 14:49:04 +0000 (10:49 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 14 Jul 2015 14:49:04 +0000 (10:49 -0400)

Trivial merge