Cleaned up a few files. -jmcdaniel
Added phone to user and fixed validations that got lost in merge.
Merged changes from jhardy.
Fixed certifcations route overwite and merged in latest changes from remote.
Merged dhagen with dev-master.