Merge branch 'sanritz'
modify calor setting of vim
Merge branch 'master' into sanritz