The etag bug is fixed for real! woo.

Hello @nicks, 

Please review the following commits I made in branch 'nick-etag'.

9e4eeedad57770b6ff922ac0529e722e54e4737f (2014-08-12 22:30:55 -0400)
The etag bug is fixed for real! woo.

R=@nicks