Merge request for jdfreeman branch

contactus.php is deprecated. Using email2.php instead.