Be able to work with non-edx amis.
Merge pull request #10 from edx/feanil/fix_for_non_edx_amis

Be able to work with non-edx amis.