Merging in Dan's fixes

 for features overflow, space between header and testimonials, etc.