Merge pull request #294 from pulp/rbarlow-908952

908952 - Removed an erroneous note in the installation documentation.
910540 - fix file overlaps in platform packaging.
Merge pull request #300 from pulp/jortel-910540

910540 - fix file overlaps in platform packaging.
Merge branch 'pulp-2.0'