diff --git a/.gitignore b/.gitignore
index bfb5ce14..61dc6b52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ junk*
 *.user
 *.pyproj
 *.suo
+.DS_Store
diff --git a/weewx.conf b/weewx.conf
index 616016b9..3753127d 100644
--- a/weewx.conf
+++ b/weewx.conf
@@ -67,7 +67,8 @@ version = 3.6.1
         # and specify a username and password.
         enable = false
         username = replace_me
-        password = replace_me
+		# To guard against parsing errors, put your password in quotes:
+        password = "replace_me"
 
     [[CWOP]]
         # This section is for configuring posts to CWOP.
@@ -88,7 +89,8 @@ version = 3.6.1
         # and specify a station and password.
         enable = false
         station  = replace_me
-        password = replace_me
+		# To guard against parsing errors, put your password in quotes:
+        password = "replace_me"
 
     [[WOW]]
         # This section is for configuring posts to WOW.
@@ -97,7 +99,8 @@ version = 3.6.1
         # and specify a station and password.
         enable = false
         station  = replace_me
-        password = replace_me
+		# To guard against parsing errors, put your password in quotes:
+        password = "replace_me"
 
     [[Wunderground]]
         # This section is for configuring posts to the Weather Underground.
@@ -106,7 +109,8 @@ version = 3.6.1
         # and specify a station (e.g., 'KORHOODR3') and password.
         enable = false
         station  = replace_me
-        password = replace_me
+		# To guard against parsing errors, put your password in quotes:
+        password = "replace_me"
         
         # Set the following to True to have weewx use the WU "Rapidfire"
         # protocol. Not all hardware can support it. See the User's Guide.
@@ -146,7 +150,7 @@ version = 3.6.1
         
         # If you wish to use FTP, uncomment and fill out the next four lines.
         #user = replace with the ftp username
-        #password = replace with the ftp password
+        #password = replace with the ftp password; put in quotes to guard against parsing errors.
         #server = replace with the ftp server name, e.g, www.threefools.org
         #path = replace with the ftp destination directory (e.g., /weather)
         
@@ -346,8 +350,8 @@ version = 3.6.1
         host = localhost
         # The user name for logging in to the host
         user = weewx
-        # The password for the user name
-        password = weewx
+        # The password for the user name. Put in quotes to guard against parsing errors.
+        password = "weewx"
 
 ##############################################################################