Added --skip-sails and --skip-ember flag to up command.
Updated changelog and manual merge.