Merge pull request phpspec#6 from stof/patch-1

Add the branch-alias for master

Merge pull request phpspec#2 from samdark/5.5-and-cleanup

5.5 and cleanup

Merge pull request phpspec#1 from RobLoach/validate-composer

Fix composer.json so that it validates

Redo directory structure to match current coding style, rename classe…

…s to match directory style, fix up naming conventions