Bad Commit: updates from vim and stuff