clean up
Merge branch 'master' of github.com:zx1986/xProfile

Conflicts:
	Makefile
	vim/after/syntax/html.vim
	vim/vimrc
	zshrc
damn it rebase!