Fixes to merchant.py

Correct order of arguments to create_watching_only_wallet and correct
usage of sqlite3
Merge pull request #631 from jisqyv/jischanges

Updates for merchant.py