updates for 7zip, anaconda3
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/spoon.me