Quick attempt to make quickflat work with rois
Laptop updates to add extra_disp layer
Merge branch 'extra_layers' of https://github.com/gallantlab/pycortex into extra_layers

Conflicts:
	cortex/quickflat.py