Force Unix line endings for all files
Merge remote-tracking branch 'upstream/master'
Fix Composer version check

I've seen this for a few versions of VVV that in both Ubuntu 12.04 and 14.04 the below line of code would always evaluate to false, and as such, always install Composer instead of checking for an update:
```bash
if [[ -n "$(composer --version | grep -q 'Composer version')" ]]; then
```

I propose using the following, which seems to evaluate more consistently:
```bash
if [[ -n "$(composer --version --no-ansi | grep 'Composer version')" ]]; then
```
Fix typo concerning paths
Fix typo in file path.
Include PHPCS in PHP FPM `$PATH` environment var
Merge pull request #367 from teraphy/master

Force LF line endings on all text files via .gitattributes
Bump VirtualBox VM memory allocation to 1024 from 512

1GB seems to be a nicer answer than 512MB by default. A Customfile
can be used to reduce or raise the memory footprint to another
level.

Fixes #427
Merge pull request #429 from simonwheatley/feature/path-inc-phpcs

Include PHPCS in PHP FPM `$PATH` environment var
Merge pull request #439 from Varying-Vagrant-Vagrants/update/memory

[PR] Bump VirtualBox VM memory allocation to 1024 from 512
Instruct Curl to follow 302 redirect for Wordpress source files
Merge pull request #450 from jmbarlow/curl-fix

Instruct Curl to follow 302 redirect for WordPress source files
Use HTTPS when downloading the latest WordPress package

See #350

"libcurl performs peer SSL certificate verification by default"
http://curl.haxx.se/docs/sslcerts.html

This is better practice and eliminates the current redirect from
HTTP to HTTPS. We'll leave the `-L` flag, as future redirects are
possible.

Thanks @nacin
Merge pull request #452 from Varying-Vagrant-Vagrants/https-wp

Use HTTPS when downloading the latest WordPress package
Merge pull request #421 from nacin/patch-1

Fix typo in file path
Merge pull request #400 from thewebists/patch-1

Fix Composer version check
Merge pull request #418 from iparr/master

Fix typo concerning paths
Update the list of contributors
allow www/vvv-sites folder to be tracked
moved provisioning of vvv wp sites into separate files

Conflicts:
	provision/provision.sh

Conflicts:
	provision/provision.sh

Conflicts:
	provision/provision.sh