FIX: import error, fft_convolve -> fftconvolve
DOC: add travis status to README
DOC: mv README.md README.rst
DOC: add a bit more info to the README
Merge pull request #17 from mekman/add_travis_to_readme

DOC: Add travis status and some more details to readme
Merge pull request #16 from mekman/import_fix

FIX: import error, fft_convolve -> fftconvolve
ENH: major revisions to the auditory pRF
Merge branch 'master' of https://github.com/kdesimone/popeye

Conflicts:
	popeye/utilities.py
RF: need to remove emdashes
RF: small edits, playing with documentation