Adjust .gitignore to make switching branches easier;  fix some scalatest deprecations