Merge pull request #28 from apardo/staging

Staging
Merge pull request #29 from apardo/staging

Staging
Merge pull request #30 from apardo/staging

Staging
Merge pull request #31 from apardo/staging

Staging
Merge pull request #32 from apardo/staging

Staging
Merge pull request #33 from apardo/staging

fix auth
loosen basic auth rules
allow all private networks
Merge pull request #1272 from edx/jarv/loosen-basic-auth-rules

loosen basic auth rules
loop on extra_args
Merge pull request #1273 from edx/jarv/add-quotes

loop on extra_args
updating caching for the cms
Merge pull request #1274 from edx/jarv/cms-static-cache

updating caching for the cms
always show diffs
Merge pull request #1276 from edx/jarv/show-diffs

always show diffs
add extra vars
rename var
Merge pull request #1277 from edx/jarv/add-extra-vars-to-provision

Jarv/add extra vars to provision
Revert "Jarv/add extra vars to provision"
Merge pull request #1278 from edx/revert-1277-jarv/add-extra-vars-to-provision

Revert "Jarv/add extra vars to provision"