Removed conditional fields patch that would not apply cleanly.
Cleaned up the way in which conditional features rebuild alter handled taxonomy terms.
Added updated and revised patch for conditional_fields.