Remove hash_behaviour=merge as it doesn't appear to be used, and customization issues
wip
recovered code, working.
generalization.
Removing authorized keys file from role.
adding when condition back.
changing inclusion strategy, adding template.
accidental checkin
post testing, updating default to proper value.
Comments.
Removing unneeded touch.
Merge pull request #724 from edx/e0d/automating-edxapp

E0d/automating edxapp
runs the worker role before the edxapp role

Because the CMS uses the git hash of the edx-platform for the
static path it can be problematic if you update the edx-platform
repo for the worker AFTER you update the edx-platform repo
for edxapp.  When running the edxapp role in worker mode
rake gather_assets is skipped.

This is a workaround but we may want to consider using separate
repos for worker and edxapp for situations where both are installed
on the same server.
Merge pull request #708 from edx/cg/no_more_hash_merge_ever

Remove hash_behaviour=merge
Merge pull request #725 from edx/jarv/worker-before-edxapp

runs the worker role before the edxapp role
edxapp-git-auth: allow authenticated edx-platform/edx-theme checkouts