Merge branch 'master' of github.com:inspirehep/harvesting-kit

Conflicts:
	harvestingkit/ftp_utils.py