Update README, add Marcomm by default, tweak query.py