Cleaned up a few files. -jmcdaniel
Added phone to user and fixed validations that got lost in merge.
Merged changes from jhardy.