Merge branch 'develop'
Merge pull request #7 from alleluu/develop

Develop
Update README.md
Merge branch 'develop'

Conflicts:
	README.md
Merge pull request #12 from alleluu/develop

Develop
Latest recipes, and fixes an issue when using composer to install from private repos.
Merge pull request #15 from alleluu/develop

Develop
Other than the submodules, there are no big differences between the actual recipes we use.
Merge pull request #17 from alleluu/develop

Update environment_variables.php.erb
Merge pull request #18 from alleluu/develop

Update phpvars.rb
Merge branch 'master' into develop
added documentation