Use BOX_TYPE when naming vagrant box

Signed-off-by: Andrea Law <alaw@pivotal.io>
Install bosh and cf cli

Signed-off-by: Andrea Law <alaw@pivotal.io>
Increase loopback devices

Signed-off-by: Andrea Law <alaw@pivotal.io>
Merge branch 'master' into develop

Conflicts:
	ci/ci-local-box-build.sh
	templates/virtualbox.json
	templates/vmware.json