Fixed some issues with server IP matching
Merge branch 'master' of github.com:garethbult/vdc-nebula