Added explicit "--port" option to sails lift.
Moved CORS options into a hook.
Merge