Publisher refactor

Refactor resource package/publisher stuff a bit to make it easier to follow (for me at least).  Also got s3 publisher working for non-consolidated resource packages.  Consolidated worked previously.