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 chef video tutorial to Building-your-Application page.
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
Update Italian translation