ENH: major revisions to the auditory pRF
Merge branch 'master' of https://github.com/kdesimone/popeye

Conflicts:
	popeye/utilities.py