removing vestigial image height for safari bug
Merge branch 'master' into timeline-colours