Storage all

Merge in all S3 bits, updating for the new config of apache/networking. Also, minor tweak to ip address assignment for floats.