Removed all references to sails.config.express in favor of sails.config.http
Made sails.config.express default on top of sails.config.http, for legacy apps, with warning.
Merge branches 'master' and 'master' of github.com:balderdashy/sails