add some stuff for package management tools
Merge branch 'master' into gh-pages