Store HTTP server in `locomotive` object.

This allows using the server object later on, such as in an initializer for the
purpose of creating WebSocket servers.
Fix merge conflicts.
Merge branch 'master' into 0.4.x