Adding CPU Customization to Vagrantfile
Merge pull request #314 from dbpolito/patch-4

Adding CPU Customization to Vagrantfile
workaround for bug in Couchbase Client 2.0
added docker
Merge pull request #410 from shift31/master

workaround for bug in Couchbase client library 2.0
Merge pull request #412 from lukewaite/docker

Added docker provisioning
Change sphinx pid location
Pull from repo
Restart searchd
Dont restart right away
Stop and restart searchd during provisioning
Merge branch 'sphinx_pid' of github.com:remailednet/Vaprobash into sphinx_pid

Conflicts:
	scripts/sphinxsearch.sh