Add 'conflicts' to list of available feed parameters

This, when used in combination with include_docs=true will add the _conflicts property to docs included in the _changes feed.
Merge pull request #50 from caolan/patch-1

Add 'conflicts' to list of available feed parameters