Windows Setup: Use English WAMP link
Mac Setup: Adjust MAMP link
Mac Setup: Adjust spelling of "OS X"
Merge pull request #434 from mc10/patch-1

Adjust links
Add meta charset in head

The HTTP Content-Type header has precedence but adding a meta charset in the head helps when opening an offline (e.g. downloaded) file in the browser.

Also, note that the official character set name is in uppercase.
See: http://www.iana.org/assignments/character-sets/character-sets.xhtml
Add chef video tutorial to Building-your-Application page.
Little help for Vagrant has more than 3 services
Merge pull request #436 from echochamber/add-chef-video-tutorial

Add chef video tutorial to Building-your-Application page.
Revised Mac OSX Install instructions.
Merge branch 'gh-pages' of github.com:codeguy/php-the-right-way into gh-pages

Conflicts:
	_posts/01-04-01-Mac-Setup.md
Merge pull request #439 from codeguy/feature/osx-install-improve

Revised Mac OSX Install instructions.
Update 01-04-01-Mac-Setup.md

Fix typos
Typos.
Merge branch 'gh-pages' of github.com:codeguy/php-the-right-way into gh-pages
Merge pull request #440 from marcaube/patch-1

Fix typos in Mac-Setup
Closes #441: Cleared up some string examples.
Double v Single = meh.
Fix 'faster' typo
Merge pull request #435 from GeertDD/patch-1

Add meta charset in head
Merge pull request #438 from rogeriopradoj/patch-1

Little help for Vagrant has more than 3 services now
Cant spell basic words