Update provisioning and freebsd cookbook

Conflicts:
	Vagrantfile
Copy paster config from outside /etc/init
Merge branch 'master' into staging