Update README with gateways
Fix README formatting
Merge branch 'master' into debian