Merging in Dan's fixes for scrollspy and testimonials space