Merge pull request #1 from gmaxwell/updates1
authorMatt Corallo <github@bluematt.me>
Tue, 8 Jul 2014 15:51:52 +0000 (15:51 +0000)
committerMatt Corallo <github@bluematt.me>
Tue, 8 Jul 2014 15:51:52 +0000 (15:51 +0000)
Update.


Trivial merge