More merge work

* Moved test/file.h to file.h so we're not overlapping git repos.
* conflict.h and trivial.h contain string constants for new versions of
  conflict.cpp and file.h respectively.
* Added some helper targets to CMakeLists.txt to clean up branches from
  repo expected to be found at 'test'.