pulled from master
merging
Merge branch 'master' of https://github.com/miracode/django-imagr
removing changes
removing changes
resolved merge conflict
resolved conflict in models.py
adding tests for Travis