make url use emwf format
minor clean-up
Do not touch local branches

This change avoids checking out local branches that do not already exist (except for the target "autostaging" branch of course), and tries to avoid moving the local trunk branch.
Merge pull request #3086 from dimagi/case-list-url

make url use emwf format
Merge pull request #3085 from dimagi/improve-rebuild-script

Do not touch local branches
Merge branch 'master' of github.com:dimagi/commcare-hq into fields-to-filters

Conflicts:
	corehq/apps/reports/commtrack/maps.py
	corehq/apps/reports/standard/cases/basic.py
Merge branch 'fields-to-filters' of github.com:dimagi/commcare-hq into fields-to-filters