Fixed imaps
Simplified rewind mechanisme, added a UndoToCursor command
Merge branch 'master' into pathogen-bundle