Merge pull request #7520 from jjneely/a2enmod

apache2_module module fixes
Merge pull request #7401 from atlashealth/ec2_set_ebs_optimized

ec2: set type and default for ebs_optimized flag
Merge pull request #6847 from atlashealth/ec2_vol_list

ec2_vol: adds ability to list existing volumes
Merge pull request #8227 from trondhindenes/win_setup_improvements

win_setup improvements: Correcly outputs ansible_totalmem
Merge pull request #8503 from jsmartin/fix_ec2_asg_delete

ec2_asg: Implements the proper method for terminating an auto scale group.
Merge pull request #8459 from jsmartin/ec2_lc_public_ip

Adds support for public_ip boolean for launch configurations.
Preserve all line breaks in literal blocks

Fixes #8512
Conditional imports are described under conditionals so remove the duplicate section.
Merge branch 'fixes/docker-volumes' of https://github.com/devpopol/ansible into devpopol-fixes/docker-volumes
Merge branch 'spelling' of git://github.com/cgar/ansible into devel

Conflicts:
	docsite/rst/guide_rax.rst
	plugins/callbacks/mail.py
Merge pull request #6301 from gitterHQ/devel

Pagerduty improvements
update version added info
Added --no-recommends option
Changed version_added
Update zypper

Modified "Version_added"
Update version_added
playbook: permit the serial attribute to be a pecentage string as well as well as a straight integer
Correct placement of right parenthesis.

(serial_pct)/100.0 is a typo - the parentheses should be around the entire percentage calculation, which makes much more sense when multiplying by the number of hosts (luckily BODMAS prevailed).
Add example of rolling update using a percentage.
Revise documentation versioning.