Add weechat, ack, git and nethack
Adds the backup folder for vim
Change the backup dir
Adds the custom status for tmux
Add tmuxinator script
Merge branch 'master' of github.com:benbeltran/dotfiles
Update the stuff
Update the stuff
Add gitignore
Add gitignore
Add DS_Store to gitignore
Add DS_Store to gitignore
Remove backup and DS_Store
Remove backup and DS_Store
Merge branch 'master' of github.com:benbeltran/dotfiles
Adds some plugins
Local vim/zsh changes
Merge branch 'master' of github.com:benbeltran/dotfiles
Fix broken path, also, add ctags yo.
Merge branch 'master' of github.com:benbeltran/dotfiles

Conflicts:
	vimrc