adding my emacs setup
updating my vim setup
Merge branch 'master' of github.com:code-chimp/dotfiles