Fix typo in spec
Merge pull request #227 from jmazzi/bugfix/typo

Fix typo in spec, easy merge
Formatting: removes trailing spaces, adds newline at end of file
Don't fail if feed has not changed

#fetch_and_parse returns 304 (integer) when the If-Modified-Since is older than @feed.last_fetched.
Obviously we should update last_fetched when nothing has changed
Merge pull request #231 from jeroenj/last-modified

Don't fail if feed has not changed
Revert "Obviously we should update last_fetched when nothing has changed"

This reverts commit 25a603083cf613ace7bcb327bb4656ac113a8093.

Actually we do not want this. We should only update that timestamp to what we get back from the feed.
Merge pull request #232 from jeroenj/last-modified

Little mistake in last-modified changes
Don't fail if logger is not defined

Introduced in a recent commit, a feed would be marked as "failed" if the logger is not defined (nil) when the feed content hasn't changed (304 Not Modified).
Merge pull request #234 from mherb/fetch-feed-logger

Don't fail if logger is not defined
Set feed status to green when parsing feeds returns 304
Make export serve a file
Merge pull request #236 from jeroenj/last-modified

Set feed status to green when parsing feeds returns 304
Merge pull request #237 from jmazzi/feature/export_to_file

Make export feeds serve a file
Check for api_key existing in params hash first.
Moved check for api_key into authenticated? method.
Merge pull request #242 from gaynetdinov/fix-issue-in-fever-authentication

undefined method `downcase' for nil:NilClass in FeverAPI
Merge remote-tracking branch 'upstream/master'