Add gitignore template and some shell alias
Merge branch 'master' of https://github.com/am/dotfiles

Conflicts:
	.oh-my-zsh/alias.zsh
Update vimrc