dot.init.el is added to avoid conflicts.
Merge branch 'master' of github.com:ikykkzt/confs

init.el is modyfied in mac os x for italic font-lock.
init.el is updated and merged.