Nav, .emacs changes
Merge branch 'master' of https://github.com/jordonbiondo/Emacs
yasnippet