new experiments, data, analysis, camera ready
Merge branch 'master' of https://github.com/justinek/metaphors

Conflicts:
	Paper/cogscipaper/cogsci_metaphor_submitted.log
	Paper/cogscipaper/cogsci_metaphor_submitted.pdf
	Paper/cogscipaper/cogsci_metaphor_submitted.synctex.gz