Squish images, fix sample builder issues
Merge pull request #150 from ianbarber/master

Squish images, fix sample builder issues