Fix the ec2 cloud provider tests
Remove 'running' check - it's not reliable
Merge pull request #16062 from rallytime/fix_ec2_tests

Fix the ec2 cloud provider tests
Add master opts to the loader

This allows us to create objects in the wrapper classes that are run
purely on the master opts
Improve formatting

Bullet points look better here than an indented section with an enormous
font.
Fix #16064
Add __master_opts to pylintrc exclusions
Merge pull request #16081 from terminalmage/docs

Improve formatting
Update to last stable release script, v2014.09.09

* Distro Support Fixes:
  * Updated the URL for EPEL 7
  * PIP based installations on Ubuntu 10.04 need setuptools installed
  * Arch stopped providing the version information on `/etc/arch-release`
  * Complete `salt-api` services checking skips. #450
Update to latest bootstrap stable release v2014.09.24

* Fixed salt tag version matching to also accept, for example, v2014.7. saltstack/salt-bootstrap#464
* Fix the EPEL 7 URL since epel-release is now 7.2
Lint fix, add __master_opts__ to the bultins list
Merge pull request #16097 from s0undt3ch/hotfix/bootstrap-script

[2014.7] Update to latest bootstrap stable release v2014.09.24
Merge pull request #16080 from thatch45/16061

Add master opts to the loader
Merge pull request #16082 from thatch45/16064

Fix #16064
Merge branch '2014.7' into develop

Conflicts:
	salt/cloud/deploy/bootstrap-salt.sh