Add .vimlocal to filetypes
Remove extra quote
Merge branch 'master' of github.com:csand/dotfiles
Something something zshrc change
Add emmet, venv, Marked shortcut command
Merge branch 'master' of github.com:csand/dotfiles

Conflicts:
	vimrc
Add leiningen bootstrap script
Major vimrc cleanup, trying to remove all unused settings/plugins