Update requirements, including Django 1.6
As per Django 1.6 [release notes](https://docs.djangoproject.com/en/dev/releases/1.6/) tests must now use full Python dotted paths when passed to ./manage.py test
Fixed merge conflict in requirements.txt, merge to bring up-to-date with upstream
Merge pull request #208 from jvc26/update-requirements

Update requirements, including Django 1.6