added some hooks
Merge branch 'master' of https://github.com/shevchuk/dot-emacs