Merge pull request #1764 from opscode/mcquin/ubuntu-tests

Create a cookbook and test it on Ubuntu 12.04
adding some comments to fixtures
add JSONCompat test for parsing JSON comments
fix typo in comment
Merge pull request #1810 from opscode/lcg/json-comment-tests

Lcg/json comment tests
Make sure freebsd_package is captured with the resource name it's declared with in resource collection.
Changelog info for freebsd_resource matching for ChefSpec.
Merge pull request #1812 from opscode/sersut/chef-1773

Name :freebsd_package resource `package` to provide compat with ChefSpec.
Only run end to end tests on Travis when secure environment variables are available.
CookbookSiteStreamingUploader uses ssl_verify_mode.
Append '|| true' to make unrun tests pass
Spelling error
fix proxy var issues

- if the env var is already set, leave it alone
- look for '://' to see if we were given a scheme or not
  (https_proxy may be passed an 'http://' url)
add spec tests for http_proxy fixes
add notes on bugfixes to CHANGELOG
Merge pull request #1829 from opscode/mcquin/travis_secure_env_vars

Run end to end tests conditionally on presence of secure env vars.
Remove recipe DSL from base provider.
Just use query_helpers
Update for remove recipe dsl from base provisioner.
Merge pull request #1832 from opscode/lcg/proxy-var-fixes

Lcg/proxy var fixes