Initial modifications
Re-adding Makefile
Initial reorganization of repo
Removing traits
Tests are passing in PHP 5.4
Moving server.js
Renaming test directories
Renaming ehough_puzzle_stream to puzzle_stream
PHP 5.2 test fixes
Renaming ehough_puzzle to just puzzle
PHP 5.2 fixes
Fixing travis tests
Adding some extra travis config
Tests pass in PHP 5.2
Testing travis fixes
Updating README
Merge branch 'develop'
Merge branch 'master' into develop
Typo in composer name
Merge branch 'develop'