Adding remove Xs for servers
fixup
Adding shuffle everywhere
Adding shuffle everywhere
Quote urls when shuffling
temp fix
fixup
temp fix
using urllib properly
Merge branch 'master' into dev