Ignore downloaded public serverlist if public_serverlist is false

Fixes #1807: When the server list finishes downloading, the local server
list resets in certain conditions
OSX Travis-CI script