rename flickr to flickr onebox
remove additional onebox left over from merge conflict
Merge pull request #51 from dysania/cleanup-rename-merge

Cleanup rename merge from stackexchange