update appearance setting
add settings for groovy
Merge branch 'master' of github.com:shkumagai/emacs

Conflicts:
	conf/04-fonts.el