docstring updates and optional from for cut ami for edp
Merge pull request #15 from edx/jarv/updates

docstring updates and optional from for cut ami for edp