Added lucius, merged vim with upstream