Added CF mode
Switch to https for proxies
Remove evil
Added proxy and pip_index_url
updated bashrc
fixed up zsh
Fixed up fresh emacs install
Added extra gitlab and jira plugins
Merge branch 'master' of https://github.com/daniellawrence/dot-files

Conflicts:
	dot-emacs
	dot-zshrc