Remove trailing whitespace
Convert files with windows line endings
Merge pull request #13 from Silex/develop

Clean up files