Minor changes in file headers
Added httpfieldmerge plugin (first commit)
Performance enhancements in proxy.c