Updated django dependency now that 1.7 is out
Merge branch 'master' of github.com:naderm/docker-farnsworth