add sts=4
Merge branch 'master' into vimrc
add HP
add gitolite