replace zencoding-vim with emmet-vim
replace vim-gitgutter with vim-signify
rm unused addons
update markdown & octopress
update vitality
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc