major user refactor, spec and cuke tests are either passing or pending
Merge branch 'staging' of github.com:Berkeley169/fight_Impunity_Haiti into staging