Update generated spec.
The spec generated by phpspec has changed a little.
Merge pull request #23 from whatthejeff/update-generated-spec

Update generated spec.
Readd docs to the list of folders to keep
Merge branch 'master' of github.com:phpspec/phpspec2-site
Install dev dependencies with Composer
Merge pull request #24 from jmikola/patch-1

Install dev dependencies with Composer
Fixed typo
Merge pull request #25 from pborreli/patch-1

Fixed typo
Correct "amber" typo
Merge pull request #26 from rowan-m/patch-1

Correct "amber" typo
Changed toHtml() method
Merge pull request #27 from gajdaw/typos

Changed toHtml() method
Remove param annotations
Merge pull request #29 from shanethehat/feature/remove-param-annotations

Remove param annotations
Fixed typo
Merge pull request #31 from gquemener/patch-2

Fixed typo in the Prophet Objects chapter
Added documentation about overriding default code generation templates
Fixed typo
Use better English
Merge pull request #32 from gquemener/master

Added documentation about overriding default code generation templates