Cleaned up the bulk of my code in User.php and Org.php
Spring Cleaning

Cleaned up display of address.
Removed an unnecessary 'while' loop in all format_data functions
Fixed a bug where I was calling my validation functions twice