Add support for git remotes for the salt-master.
not always YML
Merge pull request #239 from newgoliath/notalwaysYML

not always YML
Add optional attribute to docker_setup to allow for changing the
docker container image.
Attempt to get cluster flag on roles to work again.

Fix runtime issues with deployment

When marking todo or block call the functions to propagate correctly

Handle Blocked node roles in job runner.  Don't error because something
got blocked before you can run it.
Fix up polcy-rc.d in ubuntu images to allow for restart
of services.  docker base images have this in them.
Update the saltstack barclamp
1. use latest apt ppa for ubuntu/debian
2. Use a cluster role for the master to allow for multi-master
3. Add support for multi-master
Put back removed transaction
Update for Victor syntax
Fix up how we set our upstream proxy
Merge pull request #238 from galthaus/saltstack-demo

Add support for git remotes for the salt-master.
Merge pull request #240 from galthaus/docker-image-change

Add optional attribute to docker_setup to change image
Merge pull request #242 from galthaus/cluster_flag_update

Attempt to get cluster flag on roles to work again.
Merge pull request #243 from galthaus/docker-ubuntu-policyd-fix

Docker ubuntu have restrictive policy-rc.d
Clean up DHCP and DNS recipes to speed up their database roles
Add basic RHEL and Centos 7.0 support to Crowbar
Merge pull request #244 from galthaus/salt-fixes-multi-master

Update the saltstack barclamp
Merge pull request #245 from VictorLowther/fix-upstream-proxy-support

Fix up how we set our upstream proxy
Merge pull request #246 from VictorLowther/speed-dns-and-dhcp-database-roles

Clean up DHCP and DNS recipes to speed up their database roles
Merge pull request #247 from VictorLowther/add-rhel7-and-centos7-support

Add basic RHEL and Centos 7.0 support to Crowbar