Minor bashrc function changes and vim plugin updates