update aliase for kill jetty serveres
Merge branch 'master' of https://github.com/pghosh/dotfiles
resolve merge conflict