fixes #55: removed vim from aliases, and added in forbidden
Merge remote-tracking branch 'origin/master' into 0.9.16.1-om8