Merge pull request #8 from jbofill/master

Correct feed-folder list, solve datetime keyerror and update beautifulsoup
Remove oddly named sample file.

With a fresh checkout on my Mac, git reports an untracked file:
Products/feedfeeder/tests/samples/te\314\200st4.odt
When I remove *.odt, git reports that this file is missing:
Products/feedfeeder/tests/samples/t\303\250st4.odt
Weird.
I remove the file and then add it again and see if this solves it.
Add Products/feedfeeder/tests/samples/te\314\200st4.odt again.
Pin beautifulsoup4
Nuke trailing white space.
pep8
Add recent changes to changelog.
Remove non-ascii named sample file.

It is causing problems with the Travis tests and while releasing,
at least when using check-manifest.
Preparing release 2.5
Back to development: 2.6
Add test extra: Products.PloneTestCase.
Fix travis
Merge remote-tracking branch 'upstream/master'