Remove --with-data option. Data is installed by default.
Merge branch 'salt' into dev

* salt:
  Remove --with-data option. Data is installed by default.

Conflicts:
	Library/Formula/salt.rb