Add tags. Tweak conf templates and prompt the user for rpcuser and rpcpassword
Merge