adds .haml, changes user form, moves address fields back into user