Fix pillar matching per environment. New pillar for local dev environment.
Add mine functions to the minion configuration.
Merge back changes to resolve salt.mine issues as well as allowing for running a local version in Vagrant.
Merge branch 'salt-deployment-refactor' of github.com:caktus/django-project-template into salt-deployment-refactor

Conflicts:
	conf/salt/project/venv.sls