Fixed updater (hopefully), and some other small bugs

headphones/__init__.py

@@ -373,8 +373,11 @@ def shutdown(restart=False, update=False):
 	config_write()
 	
 	if update:
-		versioncheck.update()
-	
+		try:
+			versioncheck.update()
+		except Exception, e:
+			logger.warn('Headphones failed to update: %s. Restarting.' % e) 
+			
 	if restart:
 	
 		popen_list = [sys.executable, FULL_PATH]

headphones/versioncheck.py

@@ -89,7 +89,7 @@ def checkGithub():
 	
 def update():
 		
-	output, err = runGit('pull origin '+headphones.LATEST_VERSION)
+	output, err = runGit('pull origin master')
 	
 	if not output:
 		logger.error('Couldn\'t download latest version')