Feature/fallback to master images

@joshnuss - I've had to make these adjustments to get Sprangular to work on a database that's been migrated up from 1.3.