Conflicts: ChangeLog src/recur.cpp - Implemented unit tests for the +nonag and +nocolor special tags.