Fixed user profile editing.

It turns out that profile editing was broken when not changing profile
picture. This should address that issue, and also solve an issue with
our server side date model not reflecting the JavaScript one.
Merge branch 'master' into market-hookup
Fixed generation/styling of hours string.