Update gitignore
Update emacs, zsh, gitconfig
Merge branch 'master' of github.com:djui/dot-files

* 'master' of github.com:djui/dot-files:
  Update gitignore
  Add Leiningen
  Add ngrok
  Add GnuPG
  Modify

Conflicts:
	dot-emacs