Use capital Server since file contents are all of this type.
Merge branch 'server_builder_refactor' of github.com:unfiltered/unfiltered into server_builder_refactor