Remove half-assed win32 compatibility
Update ctrlp maps