expand and hook up doc test for _format_to_regex
remove print statement
update commcare version on copy

including from exchanage
upgrade alembic and fluff
Merge pull request #3238 from dimagi/alembic

upgrade alembic and fluff
update fluff submodule
Removed first header-row in exported excel file.
Merge pull request #3239 from lwyszomi/bihar_export_quickfix

Removed first header-row in exported excel file.
update django to 1.5.6
fix tests that involve importing apps
Merge pull request #3241 from dimagi/django-1.5.6

update django to 1.5.6
Merge pull request #3225 from dimagi/id-strings

Filter out hq-generated strings from "Auto fill translations"
add doc_info processor for showing usernames in case detail
remove unused code

SortedDict wasn't even imported in this file, so this never could have worked.
Merge pull request #3243 from dimagi/dead-code

remove unused code
fix rebuildstaging merge output

was autostaging => foo, is now
origin/master => foo
Merge pull request #3244 from dimagi/fix-merge-output

fix rebuildstaging merge output
Merge pull request #3234 from dimagi/update-version-on-copy

Update CommCare version when an app is copied
Revert "Merge pull request #3243 from dimagi/dead-code"

This reverts commit 4e8e19d017dbac38ddaef98f2887e6e806271c15, reversing
changes made to fb7e0aa3187e9b15e630583f02c7beb7be15feac.
clean up/fix the code I should not have deleted