docstring update; will merge acviana's next
Merge branch 'master' of github.com:keflavich/agpy

Conflicts:
	agpy/gaussfitter.py