Fix PLIST for the python option
Backport 0.85 update from trunk
Backport --pkginfodir support from trunk.
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2_sngl