update conf with instructions to receive and redirect requests for 18f.us and www.18f.us
Merge branch 'staging' of github.com:18F/18f.gsa.gov into staging