Merged data frame fixes; tests passing
Improved na.locf