Merge pull request #7 from dianping/master

sync
Merge pull request #8 from dianping/master

sync
fix bug in collector.completefile(), file rename should be done immediately
log error when rename failed in colector.completefile()
Merge pull request #52 from ErikFang/master

fix bug in collector.completefile(), file rename should be done immediately