Minor fixes for edit & new user pages.

Puts values that belong in the input_html hash into the hash instead of outside.
Also fixes users show page if user has not set country.
Merge branch 'master' of github.com:Chps/Pyc