vendor detail and index layout & images
Merge branch 'master' of https://github.com/bmease/ecig

Conflicts:
	templates/companies/detail.html