Cleanup and normalise some packages
Fix copy+paste error
Revert to using 'ocamlfind remove ...' instead of 'make uninstall'
Merge pull request #2178 from darioteixeira/master

Cleanup and normalise some packages