Getting things to work on my Mint 17 VM created some headaches, and resulted in some updated files before the smoke cleared.  Committing those changes