Added updated_settings in ES. Some cleanup.
Added updated_settings in ES. Some cleanup.

HackLinux/pyes,aparo/pyes,jayzeng/pyes,aparo/pyes,haiwen/pyes,mavarick/pyes,haiwen/pyes,mavarick/pyes,Fiedzia/pyes,Fiedzia/pyes,HackLinux/pyes,mouadino/pyes,aparo/pyes,rookdev/pyes,mavarick/pyes,haiwen/pyes,Fiedzia/pyes,jayzeng/pyes,mouadino/pyes,jayzeng/pyes,HackLinux/pyes,rookdev/pyes