wip
made users model updated forms
made sure existing controllers worked with users model
pulled down and merge with origin master
merged with local branch that added users modeled
updated troops pages to reference users model instead of scouts