deft

this is basically notational velocity for emacs
Merge branch 'master' of ssh://github.com/nbren12/dotfiles
some tidying
add theme
moved aliases to zshrc and added emacs alias for mac
fixed cursor 

the problem was a conflict involving evil