Remove unsed code, add fold for vim
Merge branch 'coffee' into develop