Fix up build tools
Merge branch 'master' of github.com:steventlamb/django-vegancity