Merge branch 'sanritz'
Merge branch 'sanritz'
Merge branch 'sanritz'
modify vim setting
add alias
Merge branch 'master' into sanritz