Merge branch 'master' of http://github.com/ryeyao/my_configurations

Conflicts:
	myubuntu/terminal/README.md
Added all gconf dir
Merge branch 'master' of http://github.com/ryeyao/my_configurations

Conflicts:
	myubuntu/terminal/README.md