Adding django assets to development file
Fixing merge conflict
Merge branch 'master' of https://github.com/oakling/akorn.buildout
Specifying requests<1.2.3 because of pypi problem, and adding django-extensions and mock