Added attribution to notavailable
Merging
Added timeout to similar image search
Merge branch 'master' of github.com:kronick/slow-internet-cafe

Conflicts:
	proxies/similarproxy.py