Add FrewnchTorrentDB to the npm module description
Removed package.json conflict file