Update config with ip addresses
Merge branch 'dev' of github.com:jg/dfs into dev