Merge pull request #19 from lexoyo/master

cleanup and updates, sessions
removed hack for gandi
prevent ftp crash because of unlink