removed conflicting snippets
added proper terminal font
Merge branch 'master' of https://github.com/peterpeerdeman/pp-dotfiles