having merged changes from the torchbox branch, revert references to that branch / vagrant-django-base box to master / precise32
Merge branch 'torchbox'
Merge branch 'torchbox' (update Django version to 1.5.4)
installing setuptools manually to ensure latest version. pip installing stevedore to avoid install problems
Merge pull request #7 from boblannon/setuptools_fix

installing setuptools manually to ensure latest version. pip installing ...
Updating dependencies for image support using Pillow (pip install pillow separarately)
bump Django version to 1.5.5