Change default margin from 5px to 4px as a better default for retina images.
Merge branch 'leslc-master'
fixes wrong sizes in test