Added some settings
Merge branch 'master' of github.com:sa-wa-m/my_emacs