Removed surround vim remap, and improved the mkdir function.