added number of cpus option to data and VagrantFile
default value: 1 cpus
added integer form field to modify number of cpus on vagrant local
default: 1
Merge branch 'feature/add_cpus_on_local_deployment' into develop
All PuPHPet files should keep LF

CRLFs in other extensions, like `erb`, were also causing problems.  As far as I know, there is no reason that any file in this folder MUST be CRLF, and there is also no reason they can't all have LF.
Merge pull request #902 from kohenkatz/patch-1

All PuPHPet files should keep LF
Merge branch 'master' of https://github.com/rot26/puphpet into rot26-master
Adds # CPU support to vmware and parallels. Related to #898