Merge pull request #322 from kmargaritis/master

Add goodvidio to adopters. Trim trailing white spaces.