Merge branch 'sanritz'
add alias
add grep igonre file in vim
Merge branch 'master' into sanritz