logo updates

added the white and yellow logo inplace of the all white also removed
all the temp logos from the repo... though they will live on the dev
server.
merge conflict

merging some conflicts