More Boostrap 2 -> 3 upgrades.

Fixes #528, #508
That's so that on the users edit page we can use the form object for the update_directory property rather than a disjoint tag. 

The other change was required because you would get an error if you checked the "remove_avatar" box on the form.  The existing form did not match up to what the controller test was doing.