Added 'pkg_name' option for packages whose 'pip name' does not match with pkg name.
Merge branch 'pip_lib' into pip_demo
Extended example.