Initial Set Up

More update
Merge branch 'master' of github.com:wleelavivat/dotfiles

Conflicts:
	.Xresources
	.aliases
	.gitignore
	.oh-my-zsh
	.tmux.conf
	.vim/bundle/Vundle.vim
	.vimrc
	.vimrc.bundles