Added conquerterm, vim key mappings