clean up
Merge branch 'master' of github.com:astrodoo/FLASH_IDL

Conflicts:
	sphere/recoll.pro
clean up