-- seem to be there in error, caused the command to fail and display the help manual
Merge pull request #6 from arcos/patch-1

Drop `--` from `salt-bootstrap.sh` arguments
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/deployment.rst
Update development docs to explain the submodule requirement
Switch path_templates to be a list of dicts to preserve order

Fix #9
Updating salt/roots
Use our new custom pillar location
Add notes about alpha status & where to get help
Copy project pillar data into place
Updating salt/roots
Lots of metadata refactoring, adding a template tag for secret strings

TODO: Update docs to match new metadata format/layout
Change vagrantfile to use `whoami` output
Add a unicode method to the Membership object
Updating salt/roots
Update salt/roots
Updating salt/roots
Change salt master settings to use the new private dir
Drop Membership | Move to single key per Project | Add Private dir

BACKWARDS INCOMPATIBLE CHANGE!

This is a drastic change to the project schema & workflow so we decided
to just ditch all of the current migrations and start again.

First working set of tests. Need more salt related tests.

Fix #1
Fixed #13
Merge remote-tracking branch 'origin/master'

* origin/master:
  Drop Membership | Move to single key per Project | Add Private dir
  Change salt master settings to use the new private dir
  Updating salt/roots
  Update salt/roots