Made splice.vim my default mergetool
removed old snippets for coffeescript
Massive Change Set

- added Clojure
- added Python
- removed bundles and helpers
- writing mode stuff
updated aliases and zsh config
Merge branch 'master' of github.com:GEverding/dotfiles