Worked on autoscrolling, but it still looks funky. We should talk about this more.
Merge remote-tracking branch 'origin/master'