Updated with improvements to bash and vim