t1769: move SaltAPIClient.django_init to SaltAPIClient.__init__
Merge branch 'master' into bpp-dev
t1769: switch from SaltAPIClient.django_init to SaltAPIClient.__init__
Merge branch 'bpp-dev' of github.com:IDCubed/inventory into bpp-dev

Conflicts:
	inventory/minions/admin.py