Add a few more packages to auto-install
Try to resolve a potential problem with tuareg-mode and which-function-mode
Merge remote-tracking branch 'upstream/master'