Merge feature SOL-20

This is a pull request to merge the SOL-20 feature (https://openedx.atlassian.net/browse/SOL-20).
The idiomatic way of getting an extension seems to be ```os.path.splitext``` in our code base. See:

http://stackoverflow.com/questions/541390/extracting-extension-from-filename-in-python