Re-sort roles to make room for a non webserver

This applies the webserver, cacheserver, and dbserver roles to all
other machines except for wsu-search, which is only a search server
s/wsu-search/wsusearch/ for hostname