Issue 14304: add proxy parameter to gem state
Fix gem unit test with new proxy parameter
Fixes for boto_elb for VPC
Ensure both availability_zones and subnets are not provided
Return vpc_zone_identifier properly from get_config

We take a list for vpc_zone_identifier as an input, but get_config
returns a comma delimited string. We need to massage the output.
Update 'doc/.tx/config' - Build #144

  http://cookingwithsalt.org/job/salt/job/transifex/144/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge pull request #15043 from s0undt3ch/hotfix/transifex-updates

Update 'doc/.tx/config' - Build #144
Update 'doc/.tx/config' - Build #144

  http://cookingwithsalt.org/job/salt/job/transifex/144/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge branch '2014.7' into develop
Merge pull request #14975 from jhenry82/issue_14304

Issue 14304: add proxy parameter to gem.installed state
Merge pull request #15029 from lyft/HOTFIX-botoelb-vpc-fixes

 Fixes for boto_elb for VPC
Merge pull request #15030 from lyft/botoasg-vpc-fixes

Return vpc_zone_identifier properly from get_config
Add salt interface config item
Update other clouds with two ssh ip options
Make sure we fallback to ssh host if no salt_host
clean up and namespace salt_interface function
clean pylint spacing errors
clean up instance variable

make sure everything is passed to bootstrap or used correctly
if salt_host isn't specified, use ssh_host
Fix broken links in contributing documentation.