Make the scrollbar a little less distracting
Merge remote-tracking branch 'creationix/master'