Fixing syntax boo boos.
Adding lint checking since we've been bitten a couple times now.
Merge pull request #433 from ycombinator/de-lint

De-linting
Running php-cs-fixer with level=psr2.
Checking for PSR-2 coding style compliance.
Merge branch 'working' into psr2-fixer
Adding --dry-run (not that it really matters).
Running php-cs-fixer with level=psr2.
Merge pull request #434 from ycombinator/psr2-fixer

Making code PSR-2 compliant
Merge pull request #435 from rackspace/working

Merging working -> master in preparation for minor release