fixed a problem
fixed docstring
Merge branch 'ajsci'

Conflicts:
	pydarn/plotting/fan.py