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
Add new London region
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.
trimming txt files to 60 chars
Should be exit 0, not return 0
Updates ajcrowe/supervisord
Removes log path option; this is handled by supervisord
Updates ajcrowe/supervisord
fixed execute-files.sh alphabetical order not working
Adds mailcatcher_path to command; fixes #906
Uses yaml definition for mailcatcher_path
Updates puphpet and supervisord
Merge branch 'master' of https://github.com/head82/puphpet into head82-master
Merge pull request #920 from head82/master

fixed execute-files.sh alphabetical order not working
Allows running files with periods. Closes #918
Merge branch 'master' of github.com:puphpet/puphpet
Adds about about minimum port number. Fixes #820
Adds Composer support to HHVM. Related to #883