Fixed most parts, which entered debugger
Merge branch 'master' of github.com:pmallappa/dotemacs