Merge pull request #181 from anodelman/ec2-tags

(OPS-2548) Cloud Asset Tagging for QA
Merge pull request #193 from anodelman/curl-wrapper

(QENG-382) Acceptance tests use curl's default ssl settings
(QA-769) Beaker fetch_puppet for PE needs to be refactored

- just some code clean up, split out windows and unix host PE fetching
  into two different functions
- tested locally on unix-style hosts