add tidy
Merge branch 'master' of github.com:yiwang/dotfiles

Conflicts:
	home/.vimrc