Merge "doxygen now recognizes README and .txt files"