Python diff / merge basic dictionaries / lists