Add `make stop` for restarting server
vagrant: Get back --natdnshostresolver1 on
Merge pull request #2961 from gratipay/theflow

Fixing various workflow glitches