Test default image mapping.
Add default image index
Add new images.
Merge branch 'master' of https://github.com/neelsmith/op

Conflicts:
	indices/inventory/opindices.xml
	indices/tbsToDefaultImage.csv
Add info