Pick up AWS variables if named ones don't exist
Update categories in SQL setup script