Fix filtering

The reserved instance JSON uses the real region names
The ondemand instance JSON uses a different name for the 'linux' images
Merge pull request #16 from bbaetz/fix-filtering

Fix filtering