Merge pull request #87 from stopyro/master

Refactor update_server_xml as it's reached the rubocop 25 lines limit
Update location resolver to limit returned locations
Merge remote-tracking branch 'upstream/master'
Merge pull request #88 from pradine/master

Update location resolver to limit returned locations