Auto indent with < and > in web-mode
Set 2 spaces as indent in js-mode
Set a shortcut for magit-status
Recompile el files on startup
Update .zshrc
Merge branch 'master' of github.com:coheyxyz/dotfiles

Conflicts:
	.zshrc