Added decorator to catch ResourceConflicts and return 409
added a 'wraps' decorator to an unrelated decorator
Merge pull request #826 from esoergel/doc_update_conflicts

Add a no_conflict_require_POST decorator.