Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added requirements file
Added django-coverage as test runner
Changed how travis install requirements
Merge pull request #84 from ludw/testcoverage

Testcoverage report now included after tests are run