Pillar example whitespace
Add FreeBSD to the package-map
Initial FreeBSD support
Merge remote-tracking branch 'origin/pr/47'

Conflicts:
	salt/master.sls
	salt/minion.sls
Merge branch 'master' into local