Fix merge.ffdf() when x and y contain identical column names

The column from y was discarded in that case. Also fix the code
so that in case of conflict suffixes are added to both x and y columns.
Find a shorter name for variables.
Fix ?merge.ffdf
Merge pull request #20 from nalimilan/master

Fix merge.ffdf, Thanks @nalimilan