Fixed up my local server
Adjusted some merges. Changed timezone.