Merge branch 'master' into qol

diff --cc configuration.default.ini
Simple merge

diff --cc mumbleBot.py
index 805c18a3787f2d56cb02a2388b384dc0d90acace,63db1b434ef133b01382c1901a21d9138dfbdced..d83af28e1b649fdc32ba7748cb29f353f8d17fc2
--- 1/mumbleBot.py
--- 2/mumbleBot.py
+++ b/mumbleBot.py
@@@ -369,14 -389,14 +387,14 @@@ if __name__ == '__main__'
      parser.add_argument("-q", "--quiet", dest="quiet", action="store_true", help="Only Error logs")
  
      # Mumble arguments
-     parser.add_argument("-s", "--server", dest="host", type=str, required=True, help="Hostname of the Mumble server")
-     parser.add_argument("-u", "--user", dest="user", type=str, required=True, help="Username for the bot, Default=abot")
-     parser.add_argument("-P", "--password", dest="password", type=str, default="", help="Server password, if required")
-     parser.add_argument("-p", "--port", dest="port", type=int, default=64738, help="Port for the Mumble server")
-     parser.add_argument("-c", "--channel", dest="channel", type=str, default="", help="Default channel for the bot")
 -    parser.add_argument("-s", "--server", dest="host", type=str, help="The server's hostame of a mumble server")
 -    parser.add_argument("-u", "--user", dest="user", type=str, help="Username you wish, Default=abot")
 -    parser.add_argument("-P", "--password", dest="password", type=str, help="Password if server requires one")
 -    parser.add_argument("-p", "--port", dest="port", type=int, help="Port for the mumble server")
 -    parser.add_argument("-c", "--channel", dest="channel", type=str, help="Default chanel for the bot")
++    parser.add_argument("-s", "--server", dest="host", type=str, help="Hostname of the Mumble server")
++    parser.add_argument("-u", "--user", dest="user", type=str, help="Username for the bot")
++    parser.add_argument("-P", "--password", dest="password", type=str, help="Server password, if required")
++    parser.add_argument("-p", "--port", dest="port", type=int, help="Port for the Mumble server")
++    parser.add_argument("-c", "--channel", dest="channel", type=str, help="Default channel for the bot")
  
      args = parser.parse_args()
-     config = configparser.ConfigParser(interpolation=None)
+     config = configparser.ConfigParser(interpolation=None, allow_no_value=True)
      parsed_configs = config.read(['configuration.default.ini', args.config], encoding='latin-1')
  
      if len(parsed_configs) == 0: