Merge branch 'release/0.0.7' into develop
Merge branch 'master' into develop
Added tox config
Added pep8 exclusions
Added travis config
Merge branch 'master' of github.com:praekelt/django-object-tools into feature/multi-dependancy-tests
Bumped setuptests version
Updated git ignore
Fixed url.defaults import issue with newer versions of django
Minor cleanup
Fixed url imports to work with newer versions of django
Removed adminmedia template tag
Fixed failing tests
Removed django1.7 tests for now
Minor cleanup
Updated changelog
Modified changelog
Merge branch 'feature/multi-dependancy-tests' into develop
Version bump
Merge branch 'release/1.0.0'