Merge pull request #6 from sixpearls/django1-4compat

Django 1.4 compatibility
Merge pull request #7 from sixpearls/collection_updates

Collection updates
It doesn't make sense to have external url in an embed object.
Whitespace cleanup and removal of unnecessary code
Getting example settings current
Updating requirements
Version bump to 1.0b1
Version 1.0
Merge branch '0.8.8'
Checking for a valid image before making a thumbnail
Version 1.0.1
Merge branch '1.0.1'