removed deprecated stuff
added more things
Merge branch 'master' of https://github.com/cgie/dotfiles