Adding mc, updating vim and TODO