Merge branch 'nightly' into python3

# Conflicts:
#	plexpy/version.py
#	plexpy/webserve.py

plexpy/users.py

@@ -77,7 +77,7 @@ def refresh_users():
                 else:
                     item['custom_avatar_url'] = item['thumb']
 
-            monitor_db.upsert('users', item, keys_dict)
+            monitor_db.upsert('users', key_dict=keys_dict, value_dict=item)
 
         query = 'UPDATE users SET is_active = 0 WHERE user_id NOT IN ({})'.format(', '.join(['?'] * len(user_ids)))
         monitor_db.action(query=query, args=user_ids)