Added gulp and changed some settings