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
Merge branch 'working' into psr2-fixer