Merge pull request #109 from missionpinball/dev

Finalize 0.20.0

README.md

@@ -1,10 +1,3 @@
-Dev Branch Notes for August 16, 2015
-====================================
-
-Note that the dev branch contains many changes from master and requires that you
-update your config files to version 3. You will need to do this before you can
-run this dev version. Details here: https://missionpinball.com/docs/configuration-file-reference/config-version-3/
-
 Mission Pinball Framework (mpf)
 ===============================
 
@@ -15,11 +8,10 @@ http://missionpinball.com/framework.
 Full documentation (available online or via a PDF) is available at
 http://missionpinball.com/docs.
 
-A Sphinx-based API reference is available in the /docs/generated/html
-directory of this project. (This is the API reference only. The full
-documentation is available via those other web links.)
+A Sphinx-based API reference is available in the gh-pages branch
 
 The Mission Pinball Framework is released via The MIT License. See LICENSE.md
 for details.
 
-The Mission Pinball Framework is created by Brian Madden and Gabe Knuth.
+The Mission Pinball Framework is created by Brian Madden and Gabe Knuth with help
+from lots of other awesome people.

mpf/system/switch_controller.py

@@ -306,7 +306,7 @@ def process_switch(self, name=None, state=1, logical=False, num=None,
 
             name = obj.name  # switches this to the name MPF wants to use
 
-        else:
+        if not obj:
             self.log.warning("Received a state change from non-configured "
                              "switch. Number: %s, Name: %s", num, name)
             return