Update hacks, for working around pre-0.10.3 bug

See #1323, and code, for documentation on the issue and the fix.

Total hack, but the best that @aronasorman and I could brainstorm.

@jamalex, if you have time to take a look, and want to make any other suggestion, glad to hear it.

I tested this using the `update` command from 0.10.2 to 0.10.3 (required a 0.10.2 tweak, since that version only pulls; modd'd temporarily to `checkout` instead), and from 0.10.3 to develop.  Both worked like CHAMPS!!