Python snippet
update ConflictMotions to 2.10

http://www.vim.org/scripts/script.php?script_id=3991
update ingo-library to 1.021

http://www.vim.org/scripts/script.php?script_id=4433