simplified a check
updated git attributes to force linux line endings
Merge pull request #2 from Gwendolyn68/develop

Some small changes
Merge branch 'develop' of git://github.com/phpDocumentor/phpDocumentor2 into develop
Merge pull request #733 from mvriel/develop

Pushing commits