Enable stream and remove TODO's
Restructure how the two webservers are configured

Mainly due to pretty significant differences in the db's each machine will be running
the web and db roles were removed and will instead will be just reworked as tasks of
each webserver.